untwist file selection logic - be explicit

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 177ece37ee0b408935d8c0e5cc2e683044a3039c..ac8fcb6f0c0c84faf78bd449587feca557c968fb 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -404,10 +404,10 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/Cancel a news message"),  NULL, summary_cancel,   0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark"),                  NULL, NULL,             0, "<Branch>"},
-       {N_("/_Mark/_Mark"),            "<shift>asterisk", summary_mark,        0, NULL},
-       {N_("/_Mark/_Unmark"),          "U", summary_unmark,    0, NULL},
+       {N_("/_Mark/_Mark"),            NULL, summary_mark,     0, NULL},
+       {N_("/_Mark/_Unmark"),          NULL, summary_unmark,   0, NULL},
        {N_("/_Mark/---"),              NULL, NULL,             0, "<Separator>"},
-       {N_("/_Mark/Mark as unr_ead"),  "<shift>exclam", summary_mark_as_unread, 0, NULL},
+       {N_("/_Mark/Mark as unr_ead"),  NULL, summary_mark_as_unread, 0, NULL},
        {N_("/_Mark/Mark as rea_d"),    NULL, summary_mark_as_read, 0, NULL},
        {N_("/_Mark/Mark all read"),    NULL, summary_mark_all_read, 0, NULL},
        {N_("/_Mark/Ignore thread"),    NULL, summary_ignore_thread, 0, NULL},
@@ -801,12 +801,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
        if (!prefs_common.summary_quicksearch_sticky
         && !quicksearch_is_running(summaryview->quicksearch)) {
-               FolderItemUpdateData source;
                quicksearch_set(summaryview->quicksearch, prefs_common.summary_quicksearch_type, "");
-
-               source.item = item;
-               source.update_flags = F_ITEM_UPDATE_ICON;
-               hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);                             
        }
 
        /* STATUSBAR_POP(summaryview->mainwin); */
@@ -3269,10 +3264,10 @@ void summary_save_as(SummaryView *summaryview)
                        g_warning("summary_save_as(): faild to convert character set.");
                        filename = g_strdup(oldstr);
                }
-               dest = filesel_select_file(_("Save as"), filename);
+               dest = filesel_select_file_save(_("Save as"), filename);
                g_free(filename);
        } else
-               dest = filesel_select_file(_("Save as"), filename);
+               dest = filesel_select_file_save(_("Save as"), filename);
        filename = NULL;
        if (!dest) return;
        if (is_file_exist(dest)) {
@@ -4333,6 +4328,9 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        if (summary_is_locked(summaryview)) return TRUE;
        if (!event) return TRUE;
 
+       if (quicksearch_has_focus(summaryview->quicksearch))
+               return FALSE;
+
        switch (event->keyval) {
        case GDK_Left:          /* Move focus */
                adj = gtk_scrolled_window_get_hadjustment
@@ -4416,14 +4414,8 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
 static void quicksearch_execute_cb(QuickSearch *quicksearch, gpointer data)
 {
        SummaryView *summaryview = data;
-       FolderItemUpdateData source;
 
        summary_show(summaryview, summaryview->folder_item);
-                   
-       source.item = summaryview->folder_item;
-       source.update_flags = F_ITEM_UPDATE_ICON;
-       hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &source);                             
-
 }
 
 static void tog_searchbar_cb(GtkWidget *w, gpointer data)