2007-11-04 [paul] 3.0.2cvs116

	* src/addressbook_foldersel.c
		fix gtk critical warning
		Patch by Pawel Pekala

diff --git a/ChangeLog b/ChangeLog
index 5e1daa4f098fc4d32c3047bf51632cba19747384..f4a5be4eabb8edd2aaf608f72e364da1b90fd644 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-04 [paul]      3.0.2cvs116
+
+       * src/addressbook_foldersel.c
+               fix gtk critical warning
+               Patch by Pawel Pekala
+

 2007-11-04 [paul]      3.0.2cvs115
 
        * tools/README
 2007-11-04 [paul]      3.0.2cvs115
 
        * tools/README

diff --git a/PATCHSETS b/PATCHSETS
index 0eff9fb581ca6d30e90b801be8fab67da1df15c9..580533183db2a5683ffc0510b83f4d21a486bdc3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3028,3 +3028,4 @@
 ( cvs diff -u -r 1.36.2.121 -r 1.36.2.122 src/common/utils.c;  ) > 3.0.2cvs113.patchset
 ( cvs diff -u -r 1.5.2.70 -r 1.5.2.71 src/gtk/gtkutils.c;  ) > 3.0.2cvs114.patchset
 ( cvs diff -u -r 1.30.2.24 -r 1.30.2.25 tools/README;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/claws-mail-compose-insert-files.pl;  ) > 3.0.2cvs115.patchset
 ( cvs diff -u -r 1.36.2.121 -r 1.36.2.122 src/common/utils.c;  ) > 3.0.2cvs113.patchset
 ( cvs diff -u -r 1.5.2.70 -r 1.5.2.71 src/gtk/gtkutils.c;  ) > 3.0.2cvs114.patchset
 ( cvs diff -u -r 1.30.2.24 -r 1.30.2.25 tools/README;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/claws-mail-compose-insert-files.pl;  ) > 3.0.2cvs115.patchset

+( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/addressbook_foldersel.c;  ) > 3.0.2cvs116.patchset

diff --git a/configure.ac b/configure.ac
index 7c8ef2fc0c84fd68c694cae28ce92fc5a03fd573..1a6aa2fa577813ff50831785ec87da83682c3d4c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=115
+EXTRA_VERSION=116

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addressbook_foldersel.c b/src/addressbook_foldersel.c
index ce27f531ba087ddc5af679965bf402a5ebc21cda..e365e0adc75c2d9ccf76cb823e6b7fe4eb75d71f 100644 (file)
--- a/src/addressbook_foldersel.c
+++ b/src/addressbook_foldersel.c
@@ -255,7 +255,7 @@ static void addressbook_foldersel_load_folder( GtkCTreeNode *parentNode, ItemFol
                fName = g_strdup( ADDRITEM_NAME(folder) );
 
                name = &fName;
                fName = g_strdup( ADDRITEM_NAME(folder) );
 
                name = &fName;

-               node = gtk_sctree_insert_node( tree, parentNode, NULL, name, FOLDER_SPACING,
+               node = gtk_ctree_insert_node( tree, parentNode, NULL, name, FOLDER_SPACING,

                                folderXpm, folderXpmMask, folderXpm, folderXpmMask,
                                FALSE, TRUE );
 
                                folderXpm, folderXpmMask, folderXpm, folderXpmMask,
                                FALSE, TRUE );
 


@@ -323,7 +323,7 @@ static void addressbook_foldersel_load_data( AddressIndex *addrIndex, gchar *pat
                                /* Add node for address book */
                                abf = ds->rawDataSource;
                                name = &dsName;
                                /* Add node for address book */
                                abf = ds->rawDataSource;
                                name = &dsName;

-                               node = gtk_sctree_insert_node( tree, NULL, NULL,
+                               node = gtk_ctree_insert_node( tree, NULL, NULL,

                                                name, FOLDER_SPACING, bookXpm,
                                                bookXpmMask, bookXpm, bookXpmMask,
                                                FALSE, TRUE );
                                                name, FOLDER_SPACING, bookXpm,
                                                bookXpmMask, bookXpm, bookXpmMask,
                                                FALSE, TRUE );