2011-04-10 [colin] 3.7.9cvs3
authorColin Leroy <colin@colino.net>
Sun, 10 Apr 2011 08:07:07 +0000 (08:07 +0000)
committerColin Leroy <colin@colino.net>
Sun, 10 Apr 2011 08:07:07 +0000 (08:07 +0000)
* src/addr_compl.c
* src/addressbook.c
* src/browseldap.c
* src/compose.c
* src/folder.c
* src/folderview.c
* src/gtk/gtkvscrollbutton.c
* src/gtk/gtkvscrollbutton.h
s/GtkFunction/GSourceFunc

ChangeLog
PATCHSETS
configure.ac
src/addr_compl.c
src/addressbook.c
src/browseldap.c
src/compose.c
src/folder.c
src/folderview.c
src/gtk/gtkvscrollbutton.c
src/gtk/gtkvscrollbutton.h

index 3ea543ff4e406cbaf053f9fd4e346c35503b248f..4e35f4ee267dc43261bd038482299bf34669f7b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-04-10 [colin]     3.7.9cvs3
+
+       * src/addr_compl.c
+       * src/addressbook.c
+       * src/browseldap.c
+       * src/compose.c
+       * src/folder.c
+       * src/folderview.c
+       * src/gtk/gtkvscrollbutton.c
+       * src/gtk/gtkvscrollbutton.h
+               s/GtkFunction/GSourceFunc
+
 2011-04-10 [colin]     3.7.9cvs2
 
        * src/mainwindow.c
index 1369e67f0b3e7d180521131e0a1b097f2ca48f16..29051277147745a1c6463d4ec2b2f589c035eb71 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.9.2.20 -r 1.9.2.21 po/cs.po;  cvs diff -u -r 1.60.2.62 -r 1.60.2.63 po/es.po;  cvs diff -u -r 1.1.2.26 -r 1.1.2.27 po/fi.po;  cvs diff -u -r 1.42.2.53 -r 1.42.2.54 po/fr.po;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/lt.po;  cvs diff -u -r 1.50.2.40 -r 1.50.2.41 po/pt_BR.po;  cvs diff -u -r 1.2.2.31 -r 1.2.2.32 po/sk.po;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 po/uk.po;  ) > 3.7.8cvs78.patchset
 ( cvs diff -u -r 1.1.2.65 -r 1.1.2.66 src/prefs_summaries.c;  ) > 3.7.9cvs1.patchset
 ( cvs diff -u -r 1.274.2.321 -r 1.274.2.322 src/mainwindow.c;  ) > 3.7.9cvs2.patchset
+( cvs diff -u -r 1.27.2.50 -r 1.27.2.51 src/addr_compl.c;  cvs diff -u -r 1.60.2.140 -r 1.60.2.141 src/addressbook.c;  cvs diff -u -r 1.2.4.25 -r 1.2.4.26 src/browseldap.c;  cvs diff -u -r 1.382.2.570 -r 1.382.2.571 src/compose.c;  cvs diff -u -r 1.213.2.201 -r 1.213.2.202 src/folder.c;  cvs diff -u -r 1.207.2.219 -r 1.207.2.220 src/folderview.c;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/gtkvscrollbutton.c;  cvs diff -u -r 1.3.2.3 -r 1.3.2.4 src/gtk/gtkvscrollbutton.h;  ) > 3.7.9cvs3.patchset
index 63a4ee3814b92fcf61f338564f2f47e8c0b514ea..79d13da36efb90ceec16f6ac58695e3e6f7bef7b 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 4edbd1d4d09d1405db0b82924c6eb660bb1be64c..d27fd0bde5be2e1a3c6344038c77555eafac0b98 100644 (file)
@@ -1057,7 +1057,7 @@ static void addrcompl_start_search( void ) {
 
        /* Sit back and wait until something happens */
        _completionIdleID_ =
-               g_idle_add( ( GtkFunction ) addrcompl_idle, NULL );
+               g_idle_add( (GSourceFunc) addrcompl_idle, NULL );
        /* g_print( "addrindex_start_search::queryID=%d\n", _queryID_ ); */
 
        addrindex_start_search( _queryID_ );
index 57bcdc1b263a3cf6816a98facf11120c980deb4f..07c99e77e564addbaf9e07196047e35d62482226 100644 (file)
@@ -4621,7 +4621,7 @@ static void addressbook_perform_search(
 
        /* Set up idler function */
        idleID = g_idle_add(
-                       ( GtkFunction ) addressbook_search_idle,
+                       (GSourceFunc) addressbook_search_idle,
                        GINT_TO_POINTER( queryID ) );
 
        /* Start search, sit back and wait for something to happen */
index 67799b5f4e5c4671c7cd261a2b53f3c09dfbdb1f..72e9f7becc3e1a125daba11efd83c7dfc88fdaa4 100644 (file)
@@ -385,7 +385,7 @@ gboolean browseldap_entry( AddressDataSource *ds, const gchar *dn ) {
        _queryID_ = ldaplocate_search_setup(
                        server, dn, browse_callback_entry, browse_callback_end );
        debug_print("query id: %d\n", _queryID_);
-       _browseIdleID_ = g_idle_add( ( GtkFunction ) browse_idle, NULL );
+       _browseIdleID_ = g_idle_add( (GSourceFunc) browse_idle, NULL );
 
        /* Start search */
        debug_print("starting search\n");
index 3a656c76fc3a1c3f44fd9a6fffacb8d9fb133ddf..7ae586d402125dc37e3a27e7106f04b381760f86 100644 (file)
@@ -525,7 +525,6 @@ static void compose_check_backwards    (GtkAction *action, gpointer data);
 static void compose_check_forwards_go     (GtkAction *action, gpointer data);
 #endif
 
-static gint compose_defer_auto_save_draft      (Compose        *compose);
 static PrefsAccount *compose_guess_forward_account_from_msginfo        (MsgInfo *msginfo);
 
 static MsgInfo *compose_msginfo_new_from_compose(Compose *compose);
@@ -10821,6 +10820,13 @@ static void compose_headerentry_changed_cb(GtkWidget *entry,
        }
 }
 
+static gboolean compose_defer_auto_save_draft(Compose *compose)
+{
+       compose->draft_timeout_tag = -1;
+       compose_draft((gpointer)compose, COMPOSE_AUTO_SAVE);
+       return FALSE;
+}
+
 static void compose_show_first_last_header(Compose *compose, gboolean show_first)
 {
        GtkAdjustment *vadj;
@@ -10935,13 +10941,7 @@ static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
            gtk_text_buffer_get_char_count(buffer) % prefs_common.autosave_length == 0 &&
            compose->draft_timeout_tag != -2 /* disabled while loading */)
                compose->draft_timeout_tag = g_timeout_add
-                       (500, (GtkFunction) compose_defer_auto_save_draft, compose);
-}
-static gint compose_defer_auto_save_draft(Compose *compose)
-{
-       compose->draft_timeout_tag = -1;
-       compose_draft((gpointer)compose, COMPOSE_AUTO_SAVE);
-       return FALSE;
+                       (500, (GSourceFunc) compose_defer_auto_save_draft, compose);
 }
 
 #if USE_ENCHANT
index ac6828f590563de94ca1cd432d2b4d7bde1d8c3b..1b5fc6fbfc0c2a3082952b90f1979b38f53b811a 100644 (file)
@@ -1382,12 +1382,9 @@ gchar *folder_item_get_identifier(FolderItem *item)
 
 Folder *folder_find_from_identifier(const gchar *identifier)
 {
-       Folder *folder;
-       gpointer d[2];
        gchar *str;
        gchar *p;
        gchar *name;
-       gchar *path;
        FolderClass *class;
 
        cm_return_val_if_fail(identifier != NULL, NULL);
index b47e254a4228bf333c5afeca12939dd1de5ec35d..e06bf3dd95f0f3f6f3d8da53f97fffebb3d322e1 100644 (file)
@@ -2705,7 +2705,7 @@ static void drag_state_stop(FolderView *folderview)
        folderview->drag_node = NULL;
 }
 
-static gint folderview_defer_expand(FolderView *folderview)
+static gboolean folderview_defer_expand(FolderView *folderview)
 {
        if (folderview->drag_node) {
                folderview_recollapse_nodes(folderview, folderview->drag_node);
@@ -2729,7 +2729,7 @@ static void drag_state_start(FolderView *folderview, GtkCMCTreeNode *node, Folde
        /* request expansion */
        if (0 != (folderview->drag_timer = g_timeout_add
                        (prefs_common.hover_timeout, 
-                        (GtkFunction)folderview_defer_expand,
+                        (GSourceFunc)folderview_defer_expand,
                         folderview))) {
                folderview->drag_node = node;
                folderview->drag_item = item;
index 471e0605a3aba0bd909d74e6f43f9cbedb7bae77..d810708df05eab8d2cfee6e08e1d9cb8a11ee6a2 100644 (file)
@@ -78,7 +78,7 @@ static void gtk_vscrollbutton_add_timer               (GtkVScrollbutton *scrollbutton);
 
 static void gtk_vscrollbutton_remove_timer     (GtkVScrollbutton *scrollbutton);
 
-static gint gtk_real_vscrollbutton_timer       (GtkVScrollbutton *scrollbutton);
+static gboolean gtk_real_vscrollbutton_timer   (GtkVScrollbutton *scrollbutton);
 
 static void gtk_vscrollbutton_set_sensitivity   (GtkAdjustment    *adjustment,
                                                 GtkVScrollbutton *scrollbutton);
@@ -288,10 +288,10 @@ static gint gtk_vscrollbutton_button_release(GtkWidget *widget,
     return TRUE;
 }
 
-gint gtk_vscrollbutton_scroll(GtkVScrollbutton *scrollbutton)
+gboolean gtk_vscrollbutton_scroll(GtkVScrollbutton *scrollbutton)
 {
     gfloat new_value;
-    gint return_val;
+    gboolean return_val;
 
     cm_return_val_if_fail(scrollbutton != NULL, FALSE);
     cm_return_val_if_fail(GTK_IS_VSCROLLBUTTON(scrollbutton), FALSE);
@@ -354,7 +354,7 @@ gtk_vscrollbutton_timer_1st_time(GtkVScrollbutton *scrollbutton)
         */
        g_source_remove(scrollbutton->timer);
        scrollbutton->timer = g_timeout_add(SCROLL_LATER_DELAY,
-                                           (GtkFunction)
+                                           (GSourceFunc)
                                            gtk_real_vscrollbutton_timer,
                                            scrollbutton);
     }
@@ -371,7 +371,7 @@ static void gtk_vscrollbutton_add_timer(GtkVScrollbutton *scrollbutton)
     if (!scrollbutton->timer) {
        scrollbutton->need_timer = TRUE;
        scrollbutton->timer = g_timeout_add(SCROLL_INITIAL_DELAY,
-                                           (GtkFunction)
+                                           (GSourceFunc)
                                            gtk_vscrollbutton_timer_1st_time,
                                            scrollbutton);
     }
@@ -389,9 +389,9 @@ static void gtk_vscrollbutton_remove_timer(GtkVScrollbutton *scrollbutton)
     scrollbutton->need_timer = FALSE;
 }
 
-static gint gtk_real_vscrollbutton_timer(GtkVScrollbutton *scrollbutton)
+static gboolean gtk_real_vscrollbutton_timer(GtkVScrollbutton *scrollbutton)
 {
-    gint return_val;
+    gboolean return_val;
 
     GDK_THREADS_ENTER();
 
@@ -401,7 +401,7 @@ static gint gtk_real_vscrollbutton_timer(GtkVScrollbutton *scrollbutton)
        if (scrollbutton->need_timer)
            scrollbutton->timer =
                g_timeout_add(SCROLL_TIMER_LENGTH, 
-                             (GtkFunction) gtk_real_vscrollbutton_timer,
+                             (GSourceFunc) gtk_real_vscrollbutton_timer,
                              (gpointer) scrollbutton);
        else {
            GDK_THREADS_LEAVE();
index 7661d77e7628e1aa947493af0c7e6df2bec6f2f5..36db41c9db54c3584ad2e73d62250ed718baadcd 100644 (file)
@@ -71,7 +71,7 @@ extern "C" {
 
 GType    gtk_vscrollbutton_get_type    (void);
 GtkWidget* gtk_vscrollbutton_new       (GtkAdjustment *adjustment);
-gint      gtk_vscrollbutton_scroll     (GtkVScrollbutton *scrollbutton);
+gboolean gtk_vscrollbutton_scroll      (GtkVScrollbutton *scrollbutton);
 
 #ifdef __cplusplus
 }