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

diff --git a/ChangeLog b/ChangeLog
index 65650f74973ebdd194938a4ebdbba75fda379051..102cdb6822e3d2ba36c52b5f450a1a1b2047c4ae 100644 (file)
--- 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
index eb09c427512949c2831e3f3ac038bd1338934f44..abaf691778fb3c15237a7b13925400ba72651876 100644 (file)
--- 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
index ba2494ac55abb7335cd1e5059898223b29616d6b..e7324ecc05ebde6a8853878da89cc5bd58292907 100644 (file)
--- 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
index cdbc4f173620ca0dc470e52fdd41cd15e9bdeb43..45aef83dce2ca8bc0a9891378aab184c44f941ae 100644 (file)
--- 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
index 3b49eff9341dff7d1c3cf8311a1bccfeb7d9bd61..e3a739cd9fdf66cdf8517ca47bef3b9a2b87886c 100644 (file)
--- 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), "");