sync with 0.9.12cvs18 HEAD

[claws.git] / src / toolbar.c

diff --git a/src/toolbar.c b/src/toolbar.c
index a264ae386f21329e98e9f3c3456162ed8486086a..429c5b74f61bd37571f682d395f439e5b795bf08 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1370,7 +1370,7 @@ Toolbar *toolbar_create(ToolbarType        type,
                                             toolbar_data->reply_btn,
                                           _("Reply to Message"), NULL);
                        n_menu_entries = sizeof(reply_entries) / 
-                               sizeof(replysender_entries[0]);
+                               sizeof(reply_entries[0]);
                        reply_combo = gtkut_combo_button_create(toolbar_data->reply_btn,
                                              reply_entries, n_menu_entries,
                                              "<Reply>", (gpointer)toolbar_item);
@@ -1684,7 +1684,12 @@ void toolbar_main_set_sensitive(gpointer data)
                SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->fwd_combo),
                        M_HAVE_ACCOUNT|M_TARGET_EXIST); 
 
-       SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST);
+       if (prefs_common.next_unread_msg_dialog == NEXTUNREADMSGDIALOG_ASSUME_NO) {
+               SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST);
+       } else {
+               SET_WIDGET_COND(toolbar->next_btn, 0);
+       }
+
        SET_WIDGET_COND(toolbar->delete_btn,
                        M_TARGET_EXIST|M_ALLOW_DELETE|M_UNLOCKED);
        SET_WIDGET_COND(toolbar->exec_btn, M_DELAY_EXEC);