2008-02-13 [colin] 3.3.0cvs12

	* src/folderview.c
		Fix important warnings

diff --git a/ChangeLog b/ChangeLog
index 3d99d4baa89a9ada8ffbc4861efe9f91ab8c862b..a69af3b9c9bcb8e6e5ebe92022636afbacd0349c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-13 [colin]     3.3.0cvs12
+
+       * src/folderview.c
+               Fix important warnings
+
 2008-02-12 [colin]     3.3.0cvs11
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index 108ca5fe3fc077bfc9d1d8ba4d81c37026450fde..edf7784fa65bfca86f86114713d9d6d7b843de8c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3225,3 +3225,4 @@
 ( cvs diff -u -r 1.207.2.195 -r 1.207.2.196 src/folderview.c;  ) > 3.3.0cvs9.patchset
 ( cvs diff -u -r 1.75.2.54 -r 1.75.2.55 src/matcher.c;  ) > 3.3.0cvs10.patchset
 ( cvs diff -u -r 1.179.2.209 -r 1.179.2.210 src/imap.c;  cvs diff -u -r 1.1.4.96 -r 1.1.4.97 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/etpan/imap-thread.h;  ) > 3.3.0cvs11.patchset
+( cvs diff -u -r 1.207.2.196 -r 1.207.2.197 src/folderview.c;  ) > 3.3.0cvs12.patchset

diff --git a/configure.ac b/configure.ac
index 72ceca65cfcfe4a2ac732284022a4651f2dc3c5d..c314cb7924bdb78983922901e6f2d338e31cbab2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folderview.c b/src/folderview.c
index a85df5900180d30bdbeefa24446bd080c6d43194..1de96c30e1dd4052d957b33b2467e20eea3bf625 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -603,15 +603,15 @@ static GtkWidget *folderview_ctree_create(FolderView *folderview)
 
 void folderview_set_column_order(FolderView *folderview)
 {
-       GtkWidget *ctree;
+       GtkWidget *ctree = folderview->ctree;
        FolderItem *item = folderview_get_selected_item(folderview);
        FolderItem *sel_item = NULL, *op_item = NULL;
        GtkWidget *scrolledwin = folderview->scrolledwin;
 
        if (folderview->selected)
-               sel_item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+               sel_item = gtk_ctree_node_get_row_data(GTK_CTREE(ctree), folderview->selected);
        if (folderview->opened)
-               op_item = gtk_ctree_node_get_row_data(ctree, folderview->opened);
+               op_item = gtk_ctree_node_get_row_data(GTK_CTREE(ctree), folderview->opened);
 
        debug_print("recreating tree...\n");
        gtk_widget_destroy(folderview->ctree);
@@ -625,9 +625,9 @@ void folderview_set_column_order(FolderView *folderview)
        gtk_widget_show(ctree);
        
        if (sel_item)
-               folderview->selected = gtk_ctree_find_by_row_data(ctree, NULL, sel_item);
+               folderview->selected = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, sel_item);
        if (op_item)
-               folderview->opened = gtk_ctree_find_by_row_data(ctree, NULL, op_item);
+               folderview->opened = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, op_item);
 
        folderview_set(folderview);
        folderview_column_set_titles(folderview);