talons

commit 1568b431fd5be67b6234227f3b6b35de70227368
parent ac26648e71ec289628fef3a5227440b7fbe8d843
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sat,  4 Oct 2008 11:01:50 +0000

2008-10-04 [paul]	3.6.0cvs5

	* src/mainwindow.c
		fix failure of Hide toolbar option on restart

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

4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-04 [paul]	3.6.0cvs5
+
+	* src/mainwindow.c
+		fix failure of Hide toolbar option on restart
+
 2008-10-04 [colin]	3.6.0cvs4
 
 	* src/addressbook.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3561,3 +3561,4 @@
 ( cvs diff -u -r 1.42.2.41 -r 1.42.2.42 po/fr.po;  ) > 3.6.0cvs2.patchset
 ( cvs diff -u -r 1.50.2.32 -r 1.50.2.33 po/pt_BR.po;  ) > 3.6.0cvs3.patchset
 ( cvs diff -u -r 1.60.2.124 -r 1.60.2.125 src/addressbook.c;  cvs diff -u -r 1.382.2.481 -r 1.382.2.482 src/compose.c;  cvs diff -u -r 1.274.2.275 -r 1.274.2.276 src/mainwindow.c;  cvs diff -u -r 1.94.2.188 -r 1.94.2.189 src/messageview.c;  cvs diff -u -r 1.395.2.393 -r 1.395.2.394 src/summaryview.c;  ) > 3.6.0cvs4.patchset
+( cvs diff -u -r 1.274.2.276 -r 1.274.2.277 src/mainwindow.c;  ) > 3.6.0cvs5.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -2154,6 +2154,9 @@ MainWindow *main_window_create()
 	}
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
 
+	toolbar_set_style(mainwin->toolbar->toolbar, 
+			  mainwin->handlebox, 
+			  prefs_common.toolbar_style);
 #ifndef GENERIC_UMPC
 	gtk_widget_hide(mainwin->hbox_stat);
 	menuitem = gtk_ui_manager_get_widget(mainwin->ui_manager, "/Menu/View/ShowHide/StatusBar");