+2005-08-05 [colin] 1.9.13cvs17
+
+ * src/prefs_common.c
+ * src/prefs_common.h
+ * src/mainwindow.c
+ * src/compose.c
+ * src/messageview.c
+ Add an hidden toolbar_detachable pref, so
+ that I can get rid of these painful handles
+ in the toolbars. Defaults to TRUE to avoid
+ changing the GUI on unsuspecting people...
+
2005-08-05 [colin] 1.9.13cvs16
* src/Makefile.am
( cvs diff -u -r 1.204.2.47 -r 1.204.2.48 src/prefs_common.c; cvs diff -u -r 1.103.2.21 -r 1.103.2.22 src/prefs_common.h; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/prefs_summaries.c; cvs diff -u -r 1.395.2.100 -r 1.395.2.101 src/summaryview.c; ) > 1.9.13cvs14.patchset
( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/prefs_summaries.c; cvs diff -u -r 1.395.2.101 -r 1.395.2.102 src/summaryview.c; ) > 1.9.13cvs15.patchset
( cvs diff -u -r 1.155.2.29 -r 1.155.2.30 src/Makefile.am; cvs diff -u -r 1.382.2.146 -r 1.382.2.147 src/compose.c; cvs diff -u -r 1.207.2.51 -r 1.207.2.52 src/folderview.c; cvs diff -u -r 1.20.2.5 -r 1.20.2.6 src/folderview.h; cvs diff -u -r 1.179.2.56 -r 1.179.2.57 src/imap.c; cvs diff -u -r 1.274.2.48 -r 1.274.2.49 src/mainwindow.c; cvs diff -u -r 1.39.2.3 -r 1.39.2.4 src/mainwindow.h; cvs diff -u -r 1.204.2.48 -r 1.204.2.49 src/prefs_common.c; cvs diff -u -r 1.103.2.22 -r 1.103.2.23 src/prefs_common.h; diff -u /dev/null src/prefs_folder_column.c; diff -u /dev/null src/prefs_folder_column.h; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/prefs_summaries.c; cvs diff -u -r 1.10.2.8 -r 1.10.2.9 src/prefs_summary_column.c; cvs diff -u -r 1.395.2.102 -r 1.395.2.103 src/summaryview.c; cvs diff -u -r 1.68.2.10 -r 1.68.2.11 src/summaryview.h; cvs diff -u -r 1.96.2.68 -r 1.96.2.69 src/textview.c; cvs diff -u -r 1.36.2.38 -r 1.36.2.39 src/common/utils.c; cvs diff -u -r 1.20.2.20 -r 1.20.2.21 src/common/utils.h; ) > 1.9.13cvs16.patchset
+( cvs diff -u -r 1.204.2.49 -r 1.204.2.50 src/prefs_common.c; cvs diff -u -r 1.103.2.23 -r 1.103.2.24 src/prefs_common.h; cvs diff -u -r 1.274.2.49 -r 1.274.2.50 src/mainwindow.c; cvs diff -u -r 1.382.2.147 -r 1.382.2.148 src/compose.c; cvs diff -u -r 1.94.2.59 -r 1.94.2.60 src/messageview.c; ) > 1.9.13cvs17.patchset
MICRO_VERSION=13
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=16
+EXTRA_VERSION=17
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
n_menu_entries, "<Compose>", compose);
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
- handlebox = gtk_handle_box_new();
+ if (prefs_common.toolbar_detachable) {
+ handlebox = gtk_handle_box_new();
+ } else {
+ handlebox = gtk_hbox_new(FALSE, 0);
+ }
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
gtk_widget_realize(handlebox);
menu_set_sensitive(ifactory, "/Help/Manual (Local)", manual_available(MANUAL_MANUAL_LOCAL));
menu_set_sensitive(ifactory, "/Help/FAQ (Local)", manual_available(MANUAL_FAQ_LOCAL));
- handlebox = gtk_handle_box_new();
- gtk_widget_show(handlebox);
- gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
- g_signal_connect(G_OBJECT(handlebox), "child_attached",
- G_CALLBACK(toolbar_child_attached), mainwin);
- g_signal_connect(G_OBJECT(handlebox), "child_detached",
- G_CALLBACK(toolbar_child_detached), mainwin);
-
+ if (prefs_common.toolbar_detachable) {
+ handlebox = gtk_handle_box_new();
+ gtk_widget_show(handlebox);
+ gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
+ g_signal_connect(G_OBJECT(handlebox), "child_attached",
+ G_CALLBACK(toolbar_child_attached), mainwin);
+ g_signal_connect(G_OBJECT(handlebox), "child_detached",
+ G_CALLBACK(toolbar_child_detached), mainwin);
+ } else {
+ handlebox = gtk_hbox_new(FALSE, 0);
+ gtk_widget_show(handlebox);
+ gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
+ }
/* link window to mainwin->window to avoid gdk warnings */
mainwin->window = window;
gtk_widget_show(menubar);
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
- handlebox = gtk_handle_box_new();
+ if (prefs_common.toolbar_detachable) {
+ handlebox = gtk_handle_box_new();
+ } else {
+ handlebox = gtk_hbox_new(FALSE, 0);
+ }
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
gtk_widget_realize(handlebox);
msgview->toolbar = toolbar_create(TOOLBAR_MSGVIEW, handlebox,
NULL, NULL, NULL},
{"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM,
NULL, NULL, NULL},
+ {"toolbar_detachable", "TRUE", &prefs_common.toolbar_detachable, P_BOOL,
+ NULL, NULL, NULL},
{"show_statusbar", "TRUE", &prefs_common.show_statusbar, P_BOOL,
NULL, NULL, NULL},
{"show_searchbar", "TRUE", &prefs_common.show_searchbar, P_BOOL,
* by subject (days) */
ToolbarStyle toolbar_style;
+ gboolean toolbar_detachable;
gboolean show_statusbar;
gint folderview_vscrollbar_policy;