sync with sylpheed 0.6.3cvs7

[claws.git] / src / mainwindow.c

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 63fdb96ecd0ef6fc44d2573cfa38caf114b44eac..9e6dc7c956beb33e7dac0d17c8b8bf45e97235eb 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -400,7 +400,7 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_File"),                          NULL, NULL, 0, "<Branch>"},
        {N_("/_File/_Add mailbox..."),          NULL, add_mailbox_cb, 0, NULL},
        {N_("/_File/_Add mbox mailbox..."),     NULL, add_mbox_cb, 0, NULL},
-       {N_("/_File/_Update folder tree"),      NULL, update_folderview_cb, 0, NULL},
+       {N_("/_File/_Rescan folder tree"),      NULL, update_folderview_cb, 0, NULL},
        {N_("/_File/_Folder"),                  NULL, NULL, 0, "<Branch>"},
        {N_("/_File/_Folder/Create _new folder..."),
                                                NULL, new_folder_cb, 0, NULL},
@@ -1313,7 +1313,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        } entry[] = {
                {"/File/Add mailbox..."        , M_UNLOCKED},
                 {"/File/Add mbox mailbox..."   , M_UNLOCKED},
-               {"/File/Update folder tree"    , M_UNLOCKED},
+               {"/File/Rescan folder tree"    , M_UNLOCKED},
                {"/File/Folder"                , M_UNLOCKED},
                {"/File/Import mbox file..."   , M_UNLOCKED},
                {"/File/Export to mbox file...", M_UNLOCKED},
@@ -1381,8 +1381,8 @@ void main_window_popup(MainWindow *mainwin)
        gdk_window_get_origin(mainwin->window->window, &x, &y);
        sx = gdk_screen_width();
        sy = gdk_screen_height();
-       x %= sx; if (x < 0) x += sx;
-       y %= sy; if (y < 0) y += sy;
+       x %= sx; if (x < 0) x = 0;
+       y %= sy; if (y < 0) y = 0;
        gdk_window_move(mainwin->window->window, x, y);
        gdk_window_raise(mainwin->window->window);
        gdk_window_show(mainwin->window->window);
@@ -1393,30 +1393,30 @@ void main_window_popup(MainWindow *mainwin)
        case SEPARATE_FOLDER:
                widget = mainwin->win.sep_folder.folderwin;
                gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x += sx;
-               y %= sy; if (y < 0) y += sy;
+               x %= sx; if (x < 0) x = 0;
+               y %= sy; if (y < 0) y = 0;
                gdk_window_move(widget->window, x, y);
                gdk_window_raise(widget->window);
                break;
        case SEPARATE_MESSAGE:
                widget = mainwin->win.sep_message.messagewin;
                gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x += sx;
-               y %= sy; if (y < 0) y += sy;
+               x %= sx; if (x < 0) x = 0;
+               y %= sy; if (y < 0) y = 0;
                gdk_window_move(widget->window, x, y);
                gdk_window_raise(widget->window);
                break;
        case SEPARATE_BOTH:
                widget = mainwin->win.sep_both.folderwin;
                gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x += sx;
-               y %= sy; if (y < 0) y += sy;
+               x %= sx; if (x < 0) x = 0;
+               y %= sy; if (y < 0) y = 0;
                gdk_window_move(widget->window, x, y);
                gdk_window_raise(widget->window);
                widget = mainwin->win.sep_both.messagewin;
                gdk_window_get_origin(widget->window, &x, &y);
-               x %= sx; if (x < 0) x += sx;
-               y %= sy; if (y < 0) y += sy;
+               x %= sx; if (x < 0) x = 0;
+               y %= sy; if (y < 0) y = 0;
                gdk_window_move(widget->window, x, y);
                gdk_window_raise(widget->window);
                break;
@@ -2441,7 +2441,7 @@ static void reply_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
                break;
        case COMPOSE_REPLY_TO_ALL:
                compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, FALSE);
+                             TRUE, TRUE);
                break;
        case COMPOSE_FORWARD:
                if (!sel->next) {
@@ -2555,7 +2555,7 @@ static void thread_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
        ifactory = gtk_item_factory_from_widget(widget);
 
        if (0 == action) {
-               summary_thread_build(mainwin->summaryview, FALSE);
+               summary_thread_build(mainwin->summaryview);
                mainwin->summaryview->folder_item->threaded = TRUE;
                menu_set_sensitive(ifactory, "/Summary/Thread view",   FALSE);
                menu_set_sensitive(ifactory, "/Summary/Unthread view", TRUE);
@@ -2777,7 +2777,7 @@ static void activate_compose_button (MainWindow *mainwin,
        if (style == TOOLBAR_NONE) 
                return;
 
-       if (style == TOOLBAR_BOTH) {    
+       if (style == TOOLBAR_BOTH) {
                gtk_widget_hide(mainwin->compose_mail_btn_plain);
                gtk_widget_hide(mainwin->compose_news_btn_plain);
                gtk_widget_hide(type == COMPOSEBUTTON_NEWS ? mainwin->compose_mail_btn 
@@ -2797,6 +2797,14 @@ static void activate_compose_button (MainWindow *mainwin,
        }
 }
 
+void main_window_toolbar_set_compose_button(MainWindow *mainwin, ComposeButtonType compose_btn_type)
+{
+       if (mainwin->compose_btn_type != compose_btn_type)
+               activate_compose_button(mainwin, 
+                                       prefs_common.toolbar_style,
+                                       compose_btn_type);
+}
+
 static void prefs_templates_open_cb(MainWindow *mainwin, guint action,
                                    GtkWidget *widget)
 {