talons

commit f3cdbe7e8979f811c434dba47f48afec614e4834
parent bc958116c87c67dc7e5e27d649c7dc1bfce2c926
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 13 Feb 2008 06:34:10 +0000

2008-02-13 [colin]	3.3.0cvs12

	* src/folderview.c
		Fix important warnings

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/folderview.c
 | 
10
+++++-----

4 files changed, 12 insertions(+), 6 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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);