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

diff --git a/ChangeLog b/ChangeLog
index 9e4928b3e0a5fdfc1a8624f94e15af182d42824c..18913a9e0f7fc4d2f28d885e67f6e2c501aab6bb 100644 (file)
--- 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
index f96e3140ac7d4cdb403d812c025093a3e73a3816..39bd9fb27668718b1e0c36ac6c8144823b01076b 100644 (file)
--- 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
index 24ba4299fdc02ba45ad6cd75abcbc3aef52f990a..a9758da43ee728d8864390586bf502cb9c60b496 100644 (file)
--- 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
index 640f19f9042456c217c621dafd841b76193d43d4..fb58083a3fef2da6aaaf9fef8dd01d0b2a05d469 100644 (file)
--- 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)