2007-06-28 [paul] 2.9.2cvs75

	* src/folderview.c
		fix build warnings

diff --git a/ChangeLog b/ChangeLog
index 3a9ee562e8d1e9780dff020f2ef267433c4a6309..df0753686ee7e92c50da1d0c5f7ffb1d759206b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-28 [paul]      2.9.2cvs75
+
+       * src/folderview.c
+               fix build warnings
+
 2007-06-28 [paul]      2.9.2cvs74
 
        * tools/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 577b759e549da7270185f8559a8a8bf7195ef4fa..c78b9300b18b734fab043df365fb5189b23c98e9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2650,3 +2650,4 @@
 ( cvs diff -u -r 1.13.2.27 -r 1.13.2.28 src/common/plugin.c;  cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/common/plugin.h;  cvs diff -u -r 1.1.2.30 -r 1.1.2.31 src/plugins/bogofilter/bogofilter.c;  cvs diff -u -r 1.13.2.32 -r 1.13.2.33 src/plugins/clamav/clamav_plugin.c;  cvs diff -u -r 1.13.2.14 -r 1.13.2.15 src/plugins/demo/demo.c;  cvs diff -u -r 1.12.2.20 -r 1.12.2.21 src/plugins/dillo_viewer/dillo_viewer.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpcore/plugin.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/plugins/pgpinline/plugin.c;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/plugins/pgpmime/plugin.c;  cvs diff -u -r 1.18.2.53 -r 1.18.2.54 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.14.2.53 -r 1.14.2.54 src/plugins/trayicon/trayicon.c;  ) > 2.9.2cvs72.patchset
 ( cvs diff -u -r 1.2.2.21 -r 1.2.2.22 src/news_gtk.c;  ) > 2.9.2cvs73.patchset
 ( cvs diff -u -r 1.25.2.19 -r 1.25.2.20 tools/Makefile.am;  ) > 2.9.2cvs74.patchset
+( cvs diff -u -r 1.207.2.165 -r 1.207.2.166 src/folderview.c;  ) > 2.9.2cvs75.patchset

diff --git a/configure.ac b/configure.ac
index 18a3ddcccc304e4c515671dca194fc48dfd106ae..44072e3a48b83d2d3971a86ee4b20c36e758b6f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=74
+EXTRA_VERSION=75
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index c4efce15d638792b489a65d3d3e7e2c544cff3a6..d8c04cab736996440b8f11d21499a99084c45a16 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2068,7 +2068,8 @@ void folderview_close_opened(FolderView *folderview)
        if (folderview->opened) {
                FolderItem *olditem;
                
-               olditem = gtk_ctree_node_get_row_data(folderview->ctree, folderview->opened);
+               olditem = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree), 
+                                                     folderview->opened);
                if (olditem) {
                        gchar *buf = g_strdup_printf(_("Closing Folder %s..."), 
                                olditem->path ? olditem->path:olditem->name);
@@ -2086,7 +2087,7 @@ void folderview_close_opened(FolderView *folderview)
 
        if (folderview->opened &&
            !GTK_CTREE_ROW(folderview->opened)->children)
-               gtk_ctree_collapse(folderview->ctree, folderview->opened);
+               gtk_ctree_collapse(GTK_CTREE(folderview->ctree), folderview->opened);
 
        folderview->opened = NULL;
 }