talons

commit c96231660500d2996673c9809ec70707240def0b
parent 70ddb42c5ccb3eed8761be6344032da994cefb29
Author: Colin Leroy <colin@colino.net>
Date:   Wed, 16 Jul 2008 06:36:21 +0000

2008-07-16 [colin]	3.5.0cvs24

	* src/mainwindow.c
		Fix folderview's scrolbar when starting minimised
		to tray, and popping up the mainwindow by calling
		claws-mail from the command line

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/mainwindow.c
 | 
13
+++++++++++++

4 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-16 [colin]	3.5.0cvs24
+
+	* src/mainwindow.c
+		Fix folderview's scrolbar when starting minimised
+		to tray, and popping up the mainwindow by calling
+		claws-mail from the command line
+
 2008-07-08 [colin]	3.5.0cvs23
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3435,3 +3435,4 @@
 ( cvs diff -u -r 1.274.2.251 -r 1.274.2.252 src/mainwindow.c;  ) > 3.5.0cvs21.patchset
 ( cvs diff -u -r 1.207.2.201 -r 1.207.2.202 src/folderview.c;  cvs diff -u -r 1.395.2.372 -r 1.395.2.373 src/summaryview.c;  ) > 3.5.0cvs22.patchset
 ( cvs diff -u -r 1.382.2.455 -r 1.382.2.456 src/compose.c;  ) > 3.5.0cvs23.patchset
+( cvs diff -u -r 1.274.2.252 -r 1.274.2.253 src/mainwindow.c;  ) > 3.5.0cvs24.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=23
+EXTRA_VERSION=24
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -3216,6 +3216,18 @@ static void mailing_list_compose (GtkWidget *w, gpointer *data)
  	open_uri (mailto, prefs_common_get_uri_cmd());
 } 
 	
+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;
+}
+
 void main_window_popup(MainWindow *mainwin)
 {
 	static gboolean first_start = TRUE;
@@ -3239,6 +3251,7 @@ void main_window_popup(MainWindow *mainwin)
 			mainwindow_exit_folder(mainwin);
 		}
 	}
+	fix_folderview_scroll(mainwin);
 }
 
 void main_window_show(MainWindow *mainwin)