Fix Reply from mainwindow menu and toolbar when mainwindow's

[claws.git] / src / mainwindow.c

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 5259a5d35ace00bc342b05d0dab76e36ba17ca67..30376f0b6c17d2819f0b153bfd230fe9878c1671 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1369,9 +1369,11 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
        {
                GtkWidget *entry =
                        quicksearch_get_entry(mainwin->summaryview->quicksearch);
-               gboolean dummy;
-               g_signal_emit_by_name(entry, "key-press-event", event, &dummy);
-               return TRUE;
+               gboolean handled;
+               g_signal_emit_by_name(entry, "key-press-event", event, &handled);
+               if (handled) {
+                       return TRUE;
+               }
        }
 
        switch (event->keyval) {
@@ -4118,7 +4120,15 @@ static void main_window_reply_cb(GtkAction *gaction, gpointer data)
 
        msginfo_list = summary_get_selection(mainwin->summaryview);
        cm_return_if_fail(msginfo_list != NULL);
-       compose_reply_from_messageview(msgview, msginfo_list, action);
+
+       if (!summary_has_opened_message(mainwin->summaryview)) {
+               compose_reply_from_messageview(NULL, msginfo_list, action);
+       } else if (summary_is_opened_message_selected(mainwin->summaryview)) {
+               compose_reply_from_messageview(msgview, msginfo_list, action);
+       } else {
+               compose_reply_from_messageview(msgview, NULL, action);
+       }
+
        g_slist_free(msginfo_list);
 }