2008-03-05 [colin] 3.3.1cvs11

	* src/summaryview.c
	* src/summaryview.h
		Replace that hbox with a notebook

diff --git a/ChangeLog b/ChangeLog
index 0569ee44e100d5af0307ce667bb9ad62ad46e80a..f60e691809e5ba5905a1591eedd01042ccefeaed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-05 [colin]     3.3.1cvs11
+
+       * src/summaryview.c
+       * src/summaryview.h
+               Replace that hbox with a notebook
+
 2008-03-05 [colin]     3.3.1cvs10
 
        * src/folder.h

diff --git a/PATCHSETS b/PATCHSETS
index 2a6e14dd73f72aca0f84f659c54cb2b04e562aeb..eab89ce842eceafb2b36f4b2f736d7bcfc9fca41 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3245,3 +3245,4 @@
 ( cvs diff -u -r 1.94.2.172 -r 1.94.2.173 src/messageview.c;  ) > 3.3.1cvs8.patchset
 ( cvs diff -u -r 1.87.2.55 -r 1.87.2.56 src/folder.h;  cvs diff -u -r 1.207.2.197 -r 1.207.2.198 src/folderview.c;  cvs diff -u -r 1.395.2.355 -r 1.395.2.356 src/summaryview.c;  cvs diff -u -r 1.68.2.42 -r 1.68.2.43 src/summaryview.h;  ) > 3.3.1cvs9.patchset
 ( cvs diff -u -r 1.87.2.55 -r 1.87.2.56 src/folder.h;  cvs diff -u -r 1.207.2.197 -r 1.207.2.198 src/folderview.c;  cvs diff -u -r 1.395.2.355 -r 1.395.2.356 src/summaryview.c;  cvs diff -u -r 1.68.2.42 -r 1.68.2.43 src/summaryview.h;  ) > 3.3.1cvs10.patchset
+( cvs diff -u -r 1.395.2.356 -r 1.395.2.357 src/summaryview.c;  cvs diff -u -r 1.68.2.43 -r 1.68.2.44 src/summaryview.h;  ) > 3.3.1cvs11.patchset

diff --git a/configure.ac b/configure.ac
index 98a7ab354d9c2a5b0f1205f617b31b77312f9193..8bfb8d68bbe1123230ebf31dfed1bfd6dd9e6b11 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=10
+EXTRA_VERSION=11
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/summaryview.c b/src/summaryview.c
index d06b52e9909a0c2fcde8cfdd447411d5e7b601ee..fd94683abbc3415ed65e2f66361fa049ae0bb87b 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -714,10 +714,13 @@ SummaryView *summary_create(void)
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
+       summaryview->mainwidget_book = gtk_notebook_new();
+        gtk_notebook_set_show_tabs(GTK_NOTEBOOK(summaryview->mainwidget_book), FALSE);
+        gtk_notebook_set_show_border(GTK_NOTEBOOK(summaryview->mainwidget_book), FALSE);
 #ifndef MAEMO
-       summaryview->mainwidget_hbox = gtk_hbox_new(FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(summaryview->mainwidget_hbox), scrolledwin, TRUE, TRUE, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), summaryview->mainwidget_hbox, TRUE, TRUE, 0);
+       gtk_container_add(GTK_CONTAINER(summaryview->mainwidget_book),
+               scrolledwin);
+       gtk_box_pack_start(GTK_BOX(vbox), summaryview->mainwidget_book, TRUE, TRUE, 0);
 #endif
        gtk_widget_set_size_request(vbox,
                             prefs_common.summaryview_width,
@@ -741,9 +744,9 @@ SummaryView *summary_create(void)
        gtk_box_pack_start(GTK_BOX(vbox), quicksearch_get_widget(quicksearch), FALSE, FALSE, 0);
 
 #ifdef MAEMO
-       summaryview->mainwidget_hbox = gtk_hbox_new(FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(summaryview->mainwidget_hbox), scrolledwin, TRUE, TRUE, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), summaryview->mainwidget_hbox, TRUE, TRUE, 0);
+       gtk_container_add(GTK_CONTAINER(summaryview->mainwidget_book),
+               scrolledwin);
+       gtk_box_pack_start(GTK_BOX(vbox), summaryview->mainwidget_book, TRUE, TRUE, 0);
 #endif
        quicksearch_set_execute_callback(quicksearch, quicksearch_execute_cb, summaryview);
 

diff --git a/src/summaryview.h b/src/summaryview.h
index 1e53cb4a08b4f889e36d984ef5384dca25c4510f..a64b496531de844f529ec0d286253e987db2343b 100644 (file)
--- a/src/summaryview.h
+++ b/src/summaryview.h
@@ -88,7 +88,7 @@ struct _SummaryColumnState
 struct _SummaryView
 {
        GtkWidget *vbox;
-       GtkWidget *mainwidget_hbox;
+       GtkWidget *mainwidget_book;
        GtkWidget *scrolledwin;
        GtkWidget *ctree;
        GtkWidget *hbox;