talons

commit 244f493ae4962e5851809c3049da2886caaa619c
parent 36fb4e752aff819d33007bfe4bc60155e38384cd
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 12 Mar 2008 17:21:03 +0000

2008-03-12 [colin]	3.3.1cvs23

	* src/summaryview.c
		Fix a new unused variable warning
	* src/plugins/trayicon/trayicon.c
		Fix folderview's scrollbar at startup
		if starting hidden

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/plugins/trayicon/trayicon.c
 | 
13
+++++++++++++
M
src/summaryview.c
 | 
2
++

5 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-12 [colin]	3.3.1cvs23
+
+	* src/summaryview.c
+		Fix a new unused variable warning
+	* src/plugins/trayicon/trayicon.c
+		Fix folderview's scrollbar at startup
+		if starting hidden
+
 2008-03-12 [colin]	3.3.1cvs22
 
 	* src/folderview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3257,3 +3257,4 @@
 ( cvs diff -u -r 1.1.4.23 -r 1.1.4.24 src/common/xml.c;  ) > 3.3.1cvs20.patchset
 ( cvs diff -u -r 1.213.2.178 -r 1.213.2.179 src/folder.c;  cvs diff -u -r 1.87.2.56 -r 1.87.2.57 src/folder.h;  cvs diff -u -r 1.274.2.236 -r 1.274.2.237 src/mainwindow.c;  cvs diff -u -r 1.150.2.107 -r 1.150.2.108 src/procmsg.c;  cvs diff -u -r 1.395.2.358 -r 1.395.2.359 src/summaryview.c;  cvs diff -u -r 1.14.2.60 -r 1.14.2.61 src/plugins/trayicon/trayicon.c;  ) > 3.3.1cvs21.patchset
 ( cvs diff -u -r 1.207.2.198 -r 1.207.2.199 src/folderview.c;  cvs diff -u -r 1.395.2.359 -r 1.395.2.360 src/summaryview.c;  ) > 3.3.1cvs22.patchset
+( cvs diff -u -r 1.395.2.360 -r 1.395.2.361 src/summaryview.c;  cvs diff -u -r 1.14.2.61 -r 1.14.2.62 src/plugins/trayicon/trayicon.c;  ) > 3.3.1cvs23.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=22
+EXTRA_VERSION=23
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
@@ -276,6 +276,18 @@ static void resize_cb(GtkWidget *widget, GtkRequisition *req,
 	update(NULL);
 }
 
+static void fix_folderview_scroll(MainWindow *mainwin)
+{
+	static gboolean fix_done = FALSE;
+
+	if (fix_done)
+		return;
+
+	gtk_widget_queue_resize(mainwin->folderview->ctree);
+
+	fix_done = TRUE;
+}
+
 static gboolean click_cb(GtkWidget * widget,
 		         GdkEventButton * event, gpointer user_data)
 {
@@ -304,6 +316,7 @@ static gboolean click_cb(GtkWidget * widget,
 			gtk_window_set_skip_taskbar_hint(GTK_WINDOW(mainwin->window), FALSE);
 			main_window_show(mainwin);
 			gtk_window_present(GTK_WINDOW(mainwin->window));
+			fix_folderview_scroll(mainwin);
         }
 		break;
 	case 3:
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -2439,7 +2439,9 @@ static void summary_status_show(SummaryView *summaryview)
 	off_t sel_size = 0, n_size = 0;
 	MsgInfo *msginfo;
 	gchar *name;
+#if GTK_CHECK_VERSION(2, 12, 0)
 	gchar *tooltip;
+#endif
 	
 	if (!summaryview->folder_item) {
 		gtk_label_set_text(GTK_LABEL(summaryview->statlabel_folder), "");