* src/mainwindow.c

	make default message view, opened by View | Separate message
	view, look like a claws message view (which includes a menu
	bar and a toolbar)
	(fixes bug #298, "message view loses tool bar")

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 182ed1e5e0a4e7ae289051f86f8171900215beeb..24335478f4c5844a547a9b3b2de370333b6f178f 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2003-09-11 [alfons]    0.9.5claws7
+
+       * src/mainwindow.c
+               make default message view, opened by View | Separate message 
+               view, look like a claws message view (which includes a menu
+               bar and a toolbar)
+               (fixes bug #298, "message view loses tool bar") 
+
 2003-09-11 [christoph] 0.9.5claws6
 
        * src/folderview.c

diff --git a/configure.ac b/configure.ac
index c531c1a56a33e5bb5795e5e735d0877416d59f18..30a987055485090c09a583dfeedebafe92fa5383 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=6
+EXTRA_VERSION=7
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 15dc99d72ee94b1099abd1d60b16aea53d06c4b3..17be476a2304ac800156e5bce3fe7919e587daf5 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1853,9 +1853,6 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                gtk_signal_connect(GTK_OBJECT(messagewin), "delete_event",
                                   GTK_SIGNAL_FUNC(message_window_close_cb),
                                   mainwin);
-               gtk_container_add(GTK_CONTAINER(messagewin),
-                                 GTK_WIDGET_PTR(mainwin->messageview));
-               gtk_widget_realize(messagewin);
                if (messageview_is_visible(mainwin->messageview))
                        gtk_widget_show(messagewin);
        }
@@ -1943,6 +1940,13 @@ static void main_window_set_widgets(MainWindow *mainwin, SeparateType type)
                mainwin->win.sep_message.messagewin = messagewin;
                mainwin->win.sep_message.hpaned     = hpaned;
 
+               gtk_widget_realize(messagewin);
+               gtk_widget_show_all(GTK_WIDGET_PTR(mainwin->messageview));
+               gtk_widget_show_all(messagewin);
+               toolbar_set_style(mainwin->messageview->toolbar->toolbar, 
+                                 mainwin->messageview->handlebox, 
+                                 prefs_common.toolbar_style);
+
                break;
        case SEPARATE_BOTH:
                gtk_box_pack_start(GTK_BOX(vbox_body),