0.9.5claws23

[claws.git] / src / mainwindow.c

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 7931db9911862a2e3f87df23f986c3108d18266e..e640362d0d4302c9638ca41aa3770a0e58513ec6 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1013,6 +1013,8 @@ MainWindow *main_window_create(SeparateType type)
        summary_init(summaryview);
        messageview_init(messageview);
        log_window_init(mainwin->logwin);
+       log_window_set_clipping(mainwin->logwin, prefs_common.cliplog,
+                               prefs_common.loglength);
 #ifdef USE_OPENSSL
        sslcertwindow_register_hook();
 #endif
@@ -1485,7 +1487,6 @@ void main_window_add_mbox(MainWindow *mainwin)
 {
        gchar *path;
        Folder *folder;
-       FolderItem * item;
 
        path = input_dialog(_("Add mbox mailbox"),
                            _("Input the location of mailbox."),
@@ -1511,16 +1512,6 @@ void main_window_add_mbox(MainWindow *mainwin)
 
        folder_add(folder);
 
-       item = folder_item_new(folder, folder->name, NULL);
-       item->folder = folder;
-       folder->node = g_node_new(item);
-
-       folder_create_folder(item, "inbox");
-       folder_create_folder(item, "outbox");
-       folder_create_folder(item, "queue");
-       folder_create_folder(item, "draft");
-       folder_create_folder(item, "trash");
-
        folderview_set(mainwin->folderview);
 }
 
@@ -1863,9 +1854,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);
        }
@@ -1953,6 +1941,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),
@@ -2805,6 +2800,11 @@ static gboolean mainwindow_focus_in_event(GtkWidget *widget, GdkEventFocus *focu
        g_return_val_if_fail(data, FALSE);
        summary = ((MainWindow *)data)->summaryview;
        g_return_val_if_fail(summary, FALSE);
+
+       if (GTK_CLIST(summary->ctree)->selection && 
+           g_list_length(GTK_CLIST(summary->ctree)->selection) > 1)
+               return FALSE;
+
        if (summary->selected != summary->displayed)
                summary_select_node(summary, summary->displayed, FALSE, TRUE);
        return FALSE;