2006-11-26 [paul] 2.6.0cvs61

	* src/compose.c
	* src/folderview.c
	* src/inc.c
	* src/summaryview.c
	* src/gtk/gtkvscrollbutton.c
	* src/gtk/quicksearch.c
	* src/plugins/pgpcore/passphrase.c
		replace deprecated gtk_timeout_add and
		gtk_timeout_remove

diff --git a/ChangeLog b/ChangeLog
index 4fbe4842d4517b5392d6b16e2a14677eebb4fdb8..d35173982ce30cbe603510a2cc620d3e0fd9f2d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-26 [paul]      2.6.0cvs61
+
+       * src/compose.c
+       * src/folderview.c
+       * src/inc.c
+       * src/summaryview.c
+       * src/gtk/gtkvscrollbutton.c
+       * src/gtk/quicksearch.c
+       * src/plugins/pgpcore/passphrase.c
+               replace deprecated gtk_timeout_add and
+               gtk_timeout_remove
+
 2006-11-26 [paul]      2.6.0cvs60
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 34f1da0b70d91faf512990a94ac026b1800d680b..7fdf01ee38bf9493cf102a6e080260ba7133dd23 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2085,3 +2085,4 @@
 ( cvs diff -u -r 1.382.2.333 -r 1.382.2.334 src/compose.c;  ) > 2.6.0cvs58.patchset
 ( cvs diff -u -r 1.395.2.267 -r 1.395.2.268 src/summaryview.c;  ) > 2.6.0cvs59.patchset
 ( cvs diff -u -r 1.382.2.334 -r 1.382.2.335 src/compose.c;  ) > 2.6.0cvs60.patchset
+( cvs diff -u -r 1.382.2.335 -r 1.382.2.336 src/compose.c;  cvs diff -u -r 1.207.2.134 -r 1.207.2.135 src/folderview.c;  cvs diff -u -r 1.149.2.62 -r 1.149.2.63 src/inc.c;  cvs diff -u -r 1.395.2.268 -r 1.395.2.269 src/summaryview.c;  cvs diff -u -r 1.5.2.4 -r 1.5.2.5 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.1.2.51 -r 1.1.2.52 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/plugins/pgpcore/passphrase.c;  ) > 2.6.0cvs61.patchset

diff --git a/configure.ac b/configure.ac
index 5d0197a3bff30d0e8878efdf29a596c6dfd57568..2315f05c223ccc36498745d08c461ad7d588518a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=60
+EXTRA_VERSION=61
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 4a67e0553f3d3c2410840c7cb2d832cf4c1f3e5c..a90aefb9dfd4136649b151d47ab8f37c030fa314 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -7865,7 +7865,7 @@ static void compose_send_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        
        if (compose->draft_timeout_tag != -1) { /* CLAWS: disable draft timeout */
-               gtk_timeout_remove(compose->draft_timeout_tag);
+               g_source_remove(compose->draft_timeout_tag);
                compose->draft_timeout_tag = -1;
        }
 
@@ -9140,7 +9140,7 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
 
        if (prefs_common.autosave && 
            gtk_text_buffer_get_char_count(buffer) % prefs_common.autosave_length == 0)
-               compose->draft_timeout_tag = gtk_timeout_add
+               compose->draft_timeout_tag = g_timeout_add
                        (500, (GtkFunction) compose_defer_auto_save_draft, compose);
 }
 static gint compose_defer_auto_save_draft(Compose *compose)

diff --git a/src/folderview.c b/src/folderview.c
index bd68aea4270c42d59c5e0fa0ca14d7dc6d028c72..1bfcbc6810c1f289981dfa5e3a250a4ea73f52d5 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2604,7 +2604,7 @@ void folderview_reflect_prefs(void)
 static void drag_state_stop(FolderView *folderview)
 {
        if (folderview->drag_timer)
-               gtk_timeout_remove(folderview->drag_timer);
+               g_source_remove(folderview->drag_timer);
        folderview->drag_timer = 0;
        folderview->drag_node = NULL;
 }
@@ -2631,7 +2631,7 @@ static void drag_state_start(FolderView *folderview, GtkCTreeNode *node, FolderI
         * we need to call drag_state_stop() */
        drag_state_stop(folderview);
        /* request expansion */
-       if (0 != (folderview->drag_timer = gtk_timeout_add
+       if (0 != (folderview->drag_timer = g_timeout_add
                        (prefs_common.hover_timeout, 
                         (GtkFunction)folderview_defer_expand,
                         folderview))) {

diff --git a/src/gtk/gtkvscrollbutton.c b/src/gtk/gtkvscrollbutton.c
index 3b275f1b261ccf2399ffe2a6934a74154eaca3f9..c6ad14c0538496b7a5a75df62d21b6c81928ea0f 100644 (file)
--- a/src/gtk/gtkvscrollbutton.c
+++ b/src/gtk/gtkvscrollbutton.c
@@ -34,6 +34,7 @@
 #  include "config.h"
 #endif
 
+#include <glib.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkmisc.h>
@@ -305,10 +306,10 @@ gtk_vscrollbutton_timer_1st_time(GtkVScrollbutton *scrollbutton)
         * above, we might have been removed, and another added.
         */
        g_source_remove(scrollbutton->timer);
-       scrollbutton->timer = gtk_timeout_add(SCROLL_LATER_DELAY,
-                                             (GtkFunction)
-                                             gtk_real_vscrollbutton_timer,
-                                             scrollbutton);
+       scrollbutton->timer = g_timeout_add(SCROLL_LATER_DELAY,
+                                           (GtkFunction)
+                                           gtk_real_vscrollbutton_timer,
+                                           scrollbutton);
     }
     g_object_unref(G_OBJECT(scrollbutton));
     return FALSE;              /* don't keep calling this function */
@@ -322,10 +323,10 @@ static void gtk_vscrollbutton_add_timer(GtkVScrollbutton *scrollbutton)
 
     if (!scrollbutton->timer) {
        scrollbutton->need_timer = TRUE;
-       scrollbutton->timer = gtk_timeout_add(SCROLL_INITIAL_DELAY,
-                                             (GtkFunction)
-                                             gtk_vscrollbutton_timer_1st_time,
-                                             scrollbutton);
+       scrollbutton->timer = g_timeout_add(SCROLL_INITIAL_DELAY,
+                                           (GtkFunction)
+                                           gtk_vscrollbutton_timer_1st_time,
+                                           scrollbutton);
     }
 }
 
@@ -335,7 +336,7 @@ static void gtk_vscrollbutton_remove_timer(GtkVScrollbutton *scrollbutton)
     g_return_if_fail(GTK_IS_VSCROLLBUTTON(scrollbutton));
 
     if (scrollbutton->timer) {
-       gtk_timeout_remove(scrollbutton->timer);
+       g_source_remove(scrollbutton->timer);
        scrollbutton->timer = 0;
     }
     scrollbutton->need_timer = FALSE;
@@ -352,9 +353,9 @@ static gint gtk_real_vscrollbutton_timer(GtkVScrollbutton *scrollbutton)
        return_val = FALSE;
        if (scrollbutton->need_timer)
            scrollbutton->timer =
-               gtk_timeout_add(SCROLL_TIMER_LENGTH, 
-                               (GtkFunction) gtk_real_vscrollbutton_timer,
-                               (gpointer) scrollbutton);
+               g_timeout_add(SCROLL_TIMER_LENGTH, 
+                             (GtkFunction) gtk_real_vscrollbutton_timer,
+                             (gpointer) scrollbutton);
        else {
            GDK_THREADS_LEAVE();
            return FALSE;

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index ecf9c290b584e79af768a8203061d4658a94f588..ef7a171cfaca8434e52c761ce7c51ec2f63d8c0b 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -197,9 +197,9 @@ static gboolean searchbar_changed_cb(GtkWidget *widget, QuickSearch *qs)
 {
        if (prefs_common.summary_quicksearch_dynamic) {
                if (qs->press_timeout_id != -1) {
-                       gtk_timeout_remove(qs->press_timeout_id);
+                       g_source_remove(qs->press_timeout_id);
                }
-               qs->press_timeout_id = gtk_timeout_add(500,
+               qs->press_timeout_id = g_timeout_add(500,
                                searchbar_changed_timeout, qs);
        }
 

diff --git a/src/inc.c b/src/inc.c
index c30b299519098fd9f8e17a4ba0532de30c9c332a..2c37a7a229062cec7f1a347603f98c80d5b9987c 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -1403,7 +1403,7 @@ static void inc_autocheck_timer_set_interval(guint interval)
           the common preferences */
        if (prefs_common.autochk_newmail && autocheck_data
            && prefs_common.work_offline == FALSE) {
-               autocheck_timer = gtk_timeout_add
+               autocheck_timer = g_timeout_add
                        (interval, inc_autocheck_func, autocheck_data);
                debug_print("added timer = %d\n", autocheck_timer);
        }
@@ -1418,7 +1418,7 @@ void inc_autocheck_timer_remove(void)
 {
        if (autocheck_timer) {
                debug_print("removed timer = %d\n", autocheck_timer);
-               gtk_timeout_remove(autocheck_timer);
+               g_source_remove(autocheck_timer);
                autocheck_timer = 0;
        }
 }

diff --git a/src/plugins/pgpcore/passphrase.c b/src/plugins/pgpcore/passphrase.c
index 19ef8e063e619f8b96fb68ac6155a0d029736467..28cf2244150352718eefcc3880a0b0d73879461f 100644 (file)
--- a/src/plugins/pgpcore/passphrase.c
+++ b/src/plugins/pgpcore/passphrase.c
@@ -337,9 +337,9 @@ gpgmegtk_passphrase_cb(void *opaque, const char *uid_hint,
                 debug_print("%% locking passphrase failed\n");
 #endif
             if (prefs_gpg_get_config()->store_passphrase_timeout > 0) {
-                    gtk_timeout_add(prefs_gpg_get_config()
-                                    ->store_passphrase_timeout*60*1000,
-                                free_passphrase, NULL);
+                    g_timeout_add(prefs_gpg_get_config()
+                                  ->store_passphrase_timeout*60*1000,
+                                  free_passphrase, NULL);
             }
         }
         debug_print ("%% sending passphrase\n");

diff --git a/src/summaryview.c b/src/summaryview.c
index 0064f2f51823d39c244120fe9564994b63e80292..77104d2b6f2425d34b130e8c6fca7c98fb95ecb1 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -3007,7 +3007,7 @@ static void summary_display_msg_full(SummaryView *summaryview,
                        data->summaryview = summaryview;
                        data->msginfo = msginfo;
                        data->row = row;
-                       gtk_timeout_add(prefs_common.mark_as_read_delay * 1000,
+                       g_timeout_add(prefs_common.mark_as_read_delay * 1000,
                                msginfo_mark_as_read_timeout, data);
                } else if (new_window || !prefs_common.mark_as_read_on_new_window) {
                        msginfo_mark_as_read(summaryview, msginfo, row);
@@ -3397,8 +3397,7 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
                msginfo->msgnum);
 }
 
-void summary_mark_as_read
-(SummaryView *summaryview)
+void summary_mark_as_read(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;