2008-09-07 [colin] 3.5.0cvs93
authorColin Leroy <colin@colino.net>
Sun, 7 Sep 2008 21:21:56 +0000 (21:21 +0000)
committerColin Leroy <colin@colino.net>
Sun, 7 Sep 2008 21:21:56 +0000 (21:21 +0000)
* src/addressadd.c
* src/addressbook_foldersel.c
* src/gtk/gtkcmclist.c
* src/gtk/gtkcmclist.h
* src/gtk/gtkcmctree.c
* src/gtk/gtkcmctree.h
* src/gtk/gtksctree.c
* src/gtk/prefswindow.c
* src/gtk/prefswindow.h
Use GDestroyNotify instead of GtkDestroyNotify
(deprecated in GTK+ 2.14)

12 files changed:
ChangeLog
PATCHSETS
configure.ac
src/addressadd.c
src/addressbook_foldersel.c
src/gtk/gtkcmclist.c
src/gtk/gtkcmclist.h
src/gtk/gtkcmctree.c
src/gtk/gtkcmctree.h
src/gtk/gtksctree.c
src/gtk/prefswindow.c
src/gtk/prefswindow.h

index 807dad4..7d21c89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2008-09-07 [colin]     3.5.0cvs93
+
+       * src/addressadd.c
+       * src/addressbook_foldersel.c
+       * src/gtk/gtkcmclist.c
+       * src/gtk/gtkcmclist.h
+       * src/gtk/gtkcmctree.c
+       * src/gtk/gtkcmctree.h
+       * src/gtk/gtksctree.c
+       * src/gtk/prefswindow.c
+       * src/gtk/prefswindow.h
+               Use GDestroyNotify instead of GtkDestroyNotify
+               (deprecated in GTK+ 2.14)
+
 2008-09-07 [colin]     3.5.0cvs92
 
        * src/textview.c
index 55bca45..687c429 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.471 -r 1.382.2.472 src/compose.c;  ) > 3.5.0cvs90.patchset
 ( cvs diff -u -r 1.49.2.114 -r 1.49.2.115 src/procmime.c;  ) > 3.5.0cvs91.patchset
 ( cvs diff -u -r 1.96.2.204 -r 1.96.2.205 src/textview.c;  ) > 3.5.0cvs92.patchset
+( cvs diff -u -r 1.9.2.24 -r 1.9.2.25 src/addressadd.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/addressbook_foldersel.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/gtkcmclist.h;  cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gtk/gtkcmctree.h;  cvs diff -u -r 1.1.4.49 -r 1.1.4.50 src/gtk/gtksctree.c;  cvs diff -u -r 1.12.2.46 -r 1.12.2.47 src/gtk/prefswindow.c;  cvs diff -u -r 1.7.2.12 -r 1.7.2.13 src/gtk/prefswindow.h;  ) > 3.5.0cvs93.patchset
index 5dad853..72d8a1f 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=92
+EXTRA_VERSION=93
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 368ceea..117591d 100644 (file)
@@ -321,7 +321,7 @@ static void addressadd_load_folder( GtkCMCTreeNode *parentNode, ItemFolder *pare
                g_free( fName );
                fi = addressadd_create_folderinfo( fiParent->book, folder );
                gtk_cmctree_node_set_row_data_full( tree, node, fi,
-                               ( GtkDestroyNotify ) addressadd_free_folderinfo );
+                               ( GDestroyNotify ) addressadd_free_folderinfo );
                addressadd_load_folder( node, folder, fi );
                list = g_list_next( list );
        }
@@ -365,7 +365,7 @@ static void addressadd_load_data( AddressIndex *addrIndex ) {
 
                                fi = addressadd_create_folderinfo( abf, NULL );
                                gtk_cmctree_node_set_row_data_full( tree, node, fi,
-                                               ( GtkDestroyNotify ) addressadd_free_folderinfo );
+                                               ( GDestroyNotify ) addressadd_free_folderinfo );
 
                                rootFolder = addrindex_ds_get_root_folder( ds );
                                addressadd_load_folder( node, rootFolder, fi );
index d021252..d1bd6ff 100644 (file)
@@ -296,7 +296,7 @@ static void addressbook_foldersel_load_folder( GtkCMCTreeNode *parentNode, ItemF
 
                fi = addressbook_foldersel_create_folderinfo( fiParent->book, folder );
                gtk_cmctree_node_set_row_data_full( tree, node, fi,
-                               ( GtkDestroyNotify ) addressbook_foldersel_free_folderinfo );
+                               ( GDestroyNotify ) addressbook_foldersel_free_folderinfo );
                addressbook_foldersel_load_folder( node, folder, fi, nextmatch );
                list = g_list_next( list );
        }
@@ -365,7 +365,7 @@ static void addressbook_foldersel_load_data( AddressIndex *addrIndex,
 
                                fi = addressbook_foldersel_create_folderinfo( abf, NULL );
                                gtk_cmctree_node_set_row_data_full( tree, node, fi,
-                                               ( GtkDestroyNotify ) addressbook_foldersel_free_folderinfo );
+                                               ( GDestroyNotify ) addressbook_foldersel_free_folderinfo );
 
                                rootFolder = addrindex_ds_get_root_folder( ds );
                                addressbook_foldersel_load_folder( node, rootFolder, fi, nextmatch );
index 88939ac..6139717 100644 (file)
@@ -3152,7 +3152,7 @@ void
 gtk_cmclist_set_row_data_full (GtkCMCList         *clist,
                             gint              row,
                             gpointer          data,
-                            GtkDestroyNotify  destroy)
+                            GDestroyNotify  destroy)
 {
   GtkCMCListRow *clist_row;
 
index d7e934f..b8db618 100644 (file)
@@ -355,7 +355,7 @@ struct _GtkCMCListRow
   GtkStyle *style;
 
   gpointer data;
-  GtkDestroyNotify destroy;
+  GDestroyNotify destroy;
   
   guint fg_set     : 1;
   guint bg_set     : 1;
@@ -705,7 +705,7 @@ void gtk_cmclist_set_row_data (GtkCMCList *clist,
 void gtk_cmclist_set_row_data_full (GtkCMCList         *clist,
                                  gint              row,
                                  gpointer          data,
-                                 GtkDestroyNotify  destroy);
+                                 GDestroyNotify  destroy);
 
 /* returns the data set for a row */
 gpointer gtk_cmclist_get_row_data (GtkCMCList *clist,
index 89bcbf8..48cd608 100644 (file)
@@ -3405,7 +3405,7 @@ row_delete (GtkCMCTree    *ctree,
 
   if (ctree_row->row.destroy)
     {
-      GtkDestroyNotify dnotify = ctree_row->row.destroy;
+      GDestroyNotify dnotify = ctree_row->row.destroy;
       gpointer ddata = ctree_row->row.data;
 
       ctree_row->row.destroy = NULL;
@@ -5277,9 +5277,9 @@ void
 gtk_cmctree_node_set_row_data_full (GtkCMCTree         *ctree,
                                  GtkCMCTreeNode     *node,
                                  gpointer          data,
-                                 GtkDestroyNotify  destroy)
+                                 GDestroyNotify  destroy)
 {
-  GtkDestroyNotify dnotify;
+  GDestroyNotify dnotify;
   gpointer ddata;
   
   g_return_if_fail (GTK_IS_CMCTREE (ctree));
index 9f4a21a..c1fe8c4 100644 (file)
@@ -399,7 +399,7 @@ void gtk_cmctree_node_set_row_data                 (GtkCMCTree     *ctree,
 void gtk_cmctree_node_set_row_data_full            (GtkCMCTree     *ctree,
                                                  GtkCMCTreeNode *node,
                                                  gpointer      data,
-                                                 GtkDestroyNotify destroy);
+                                                 GDestroyNotify destroy);
 gpointer gtk_cmctree_node_get_row_data             (GtkCMCTree     *ctree,
                                                  GtkCMCTreeNode *node);
 void gtk_cmctree_node_moveto                       (GtkCMCTree     *ctree,
index 6732385..4d331da 100644 (file)
@@ -2787,7 +2787,7 @@ srow_delete (GtkCMCTree    *ctree,
 
   if (ctree_row->row.destroy)
     {
-      GtkDestroyNotify dnotify = ctree_row->row.destroy;
+      GDestroyNotify dnotify = ctree_row->row.destroy;
       gpointer ddata = ctree_row->row.data;
 
       ctree_row->row.destroy = NULL;
index 400763b..4cb9162 100644 (file)
@@ -71,7 +71,7 @@ struct _PrefsWindow
 
        gpointer         data;
        GSList          *prefs_pages;
-       GtkDestroyNotify func;
+       GDestroyNotify func;
 };
 
 struct _PrefsTreeNode
@@ -413,7 +413,7 @@ static void prefswindow_build_tree(GtkWidget *tree_view, GSList *prefs_pages,
 }
 
 void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
-                                                        gpointer data, GtkDestroyNotify func,
+                                                        gpointer data, GDestroyNotify func,
                                                         gint *save_width, gint *save_height,
                                                         gboolean preload_pages, gboolean activate_child,
                                                         PrefsOpenCallbackFunc open_cb,
index 306ec7e..dfda16b 100644 (file)
@@ -48,7 +48,7 @@ struct _PrefsPage
 void prefswindow_open_full             (const gchar *title, 
                                         GSList *prefs_pages,
                                         gpointer data,
-                                        GtkDestroyNotify func,
+                                        GDestroyNotify func,
                                         gint *save_width, gint *save_height,
                                         gboolean preload_pages, gboolean activate_child,
                                         PrefsOpenCallbackFunc open_cb,