projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix bug 3407, 'Pressing the "Date" column header to "sort by date" causes all columns...
[claws.git] / src / summaryview.c
diff --git a/src/summaryview.c b/src/summaryview.c
index a0935d260a8206ed2978e30b9ea477d85f1f8fd8..b3b14476c14f099d45e14828ba6d3eb8a616d6bd 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -130,12 +130,9 @@ guint summary_get_msgnum           (SummaryView            *summaryview,
                                         GtkCMCTreeNode         *node);
 
 
-static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
-                                            guint action);
-static void summary_set_hide_del_msgs_menu (SummaryView *summaryview,
-                                            guint action);
-static void summary_set_hide_read_threads_menu (SummaryView *summaryview,
-                                            guint action);
+static void summary_set_hide_menu (SummaryView *summaryview,
+                                  const gchar *menu_item,
+                                  guint action);
 
 static GtkCMCTreeNode *summary_find_prev_msg
                                        (SummaryView            *summaryview,
@@ -528,9 +525,6 @@ SummaryView *summary_create(MainWindow *mainwin)
        debug_print("Creating summary view...\n");
        summaryview = g_new0(SummaryView, 1);
 
-#if !(GTK_CHECK_VERSION(2,12,0))
-       summaryview->tooltips = tips;
-#endif
 #define SUMMARY_VBOX_SPACING 3
        vbox = gtk_vbox_new(FALSE, SUMMARY_VBOX_SPACING);
        
@@ -1324,9 +1318,9 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                                (item && item->path)?item->path:"(null)",
                                item?folder_item_parent(item):0x0,
                                item?item->no_select:FALSE);
-               summary_set_hide_read_msgs_menu(summaryview, FALSE);
-               summary_set_hide_del_msgs_menu(summaryview, FALSE);
-               summary_set_hide_read_threads_menu(summaryview, FALSE);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages", FALSE);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages", FALSE);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads", FALSE);
                summary_clear_all(summaryview);
                summaryview->folder_item = item;
                summary_thaw(summaryview);
@@ -1397,9 +1391,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
            quicksearch_has_sat_predicate(summaryview->quicksearch) == FALSE) {
                GSList *not_killed;
                
-               summary_set_hide_read_msgs_menu(summaryview, summaryview->folder_item->hide_read_msgs);
-               summary_set_hide_del_msgs_menu(summaryview, summaryview->folder_item->hide_del_msgs);
-               summary_set_hide_read_threads_menu(summaryview, summaryview->folder_item->hide_read_threads);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages",
+                                               summaryview->folder_item->hide_read_msgs);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages",
+                                               summaryview->folder_item->hide_del_msgs);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads",
+                                               summaryview->folder_item->hide_read_threads);
                not_killed = NULL;
                for(cur = mlist ; cur != NULL && cur->data != NULL ; cur = g_slist_next(cur)) {
                        MsgInfo * msginfo = (MsgInfo *) cur->data;
@@ -1432,9 +1429,12 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
                g_slist_free(mlist);
                mlist = not_killed;
        } else {
-               summary_set_hide_read_msgs_menu(summaryview, FALSE);
-               summary_set_hide_del_msgs_menu(summaryview, FALSE);
-               summary_set_hide_read_threads_menu(summaryview, FALSE);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideReadMessages",
+                                               FALSE);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideDelMessages",
+                                               FALSE);
+               summary_set_hide_menu(summaryview, "/Menu/View/HideReadThreads",
+                                               FALSE);
        }
 
        if (!hidden_removed) {
@@ -2505,6 +2505,8 @@ static void summary_set_marks_func(GtkCMCTree *ctree, GtkCMCTreeNode *node,
 
        msginfo = gtk_cmctree_node_get_row_data(ctree, node);
 
+       cm_return_if_fail(msginfo != NULL);
+
        if (MSG_IS_DELETED(msginfo->flags))
                summaryview->deleted++;
 
@@ -2805,7 +2807,9 @@ static void summary_set_column_titles(SummaryView *summaryview)
                        gtk_box_pack_start(GTK_BOX(hbox), label,
                                           FALSE, FALSE, 0);
 
-               if (summaryview->sort_key == sort_by[type]) {
+               if (summaryview->sort_key == sort_by[type] ||
+                   (summaryview->sort_key == SORT_BY_THREAD_DATE &&
+                    sort_by[SORT_BY_DATE] && type == S_COL_DATE)) {
                        arrow = gtk_arrow_new
                                (summaryview->sort_type == SORT_ASCENDING
                                 ? GTK_ARROW_DOWN : GTK_ARROW_UP,
@@ -3346,7 +3350,7 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
                        extract_address(from_text);
                }
                if (!from_text)
-                       _("(No From)");         
+                       from_text = _("(No From)");
        } else {
                gchar *tmp = summary_complete_address(msginfo->from);
                if (tmp) {
@@ -3360,10 +3364,11 @@ static inline void summary_set_header(SummaryView *summaryview, gchar *text[],
                                from_text = msginfo->from;
                        else {
                                from_text = msginfo->from;
-                               extract_address(from_text);
+                               if (from_text)
+                                       extract_address(from_text);
                        }
                        if (!from_text)
-                               _("(No From)");         
+                               from_text = _("(No From)");
                }
        }
        
@@ -3629,16 +3634,9 @@ static void summary_display_msg_full(SummaryView *summaryview,
                        data->msginfo = procmsg_msginfo_new_ref(msginfo);
                        if (summaryview->mark_as_read_timeout_tag != 0)
                                g_source_remove(summaryview->mark_as_read_timeout_tag);
-
-#if GLIB_CHECK_VERSION(2,14,0)
                        summaryview->mark_as_read_timeout_tag = 
                                g_timeout_add_seconds(prefs_common.mark_as_read_delay,
                                        msginfo_mark_as_read_timeout, data);
-#else
-                       summaryview->mark_as_read_timeout_tag = 
-                               g_timeout_add(prefs_common.mark_as_read_delay * 1000,
-                                       msginfo_mark_as_read_timeout, data);
-#endif
                } else if (new_window || !prefs_common.mark_as_read_on_new_window) {
                        msginfo_mark_as_read(summaryview, msginfo, row);
                }
@@ -4604,8 +4602,7 @@ void summary_move_to(SummaryView *summaryview)
        if (!summaryview->folder_item ||
            FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
 
-       to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
-                                        FOLDER_SEL_MOVE, NULL, FALSE);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_MOVE, NULL, FALSE);
        summary_move_selected_to(summaryview, to_folder);
 }
 
@@ -4685,8 +4682,7 @@ void summary_copy_to(SummaryView *summaryview)
 
        if (!summaryview->folder_item) return;
 
-       to_folder = foldersel_folder_sel(summaryview->folder_item->folder,
-                                        FOLDER_SEL_COPY, NULL, FALSE);
+       to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL, FALSE);
        summary_copy_selected_to(summaryview, to_folder);
 }
 
@@ -6182,7 +6178,7 @@ static gint summary_tag_cmp_list(gconstpointer a, gconstpointer b)
                return tag_b == NULL ? 0:1;
        
        if (tag_b == NULL)
-               return tag_a == NULL ? 0:1;
+               return 1;
 
        return g_utf8_collate(tag_a, tag_b);
 }
@@ -7111,7 +7107,10 @@ static void summary_size_clicked(GtkWidget *button, SummaryView *summaryview)
 
 static void summary_date_clicked(GtkWidget *button, SummaryView *summaryview)
 {
-       summary_sort_by_column_click(summaryview, SORT_BY_DATE);
+       if (summaryview->sort_key == SORT_BY_DATE)
+               summary_sort_by_column_click(summaryview, SORT_BY_DATE);
+       else
+               summary_sort_by_column_click(summaryview, SORT_BY_THREAD_DATE);
 }
 
 static void summary_from_clicked(GtkWidget *button, SummaryView *summaryview)
@@ -7808,38 +7807,15 @@ void summary_toggle_show_read_threads(SummaryView *summaryview)
        summary_show(summaryview, summaryview->folder_item);
 }
  
-static void summary_set_hide_read_msgs_menu (SummaryView *summaryview,
-                                            guint action)
+static void summary_set_hide_menu (SummaryView *summaryview,
+                                  const gchar *menu_item,
+                                  guint action)
 {
        GtkWidget *widget;
 
-       widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideReadMessages");
-       g_object_set_data(G_OBJECT(widget), "dont_toggle",
-                         GINT_TO_POINTER(1));
-       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
-       g_object_set_data(G_OBJECT(widget), "dont_toggle",
-                         GINT_TO_POINTER(0));
-}
+       widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, menu_item);
+       cm_return_if_fail(widget != NULL);
 
-static void summary_set_hide_read_threads_menu (SummaryView *summaryview,
-                                            guint action)
-{
-       GtkWidget *widget;
-
-       widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideReadThreads");
-       g_object_set_data(G_OBJECT(widget), "dont_toggle",
-                         GINT_TO_POINTER(1));
-       gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
-       g_object_set_data(G_OBJECT(widget), "dont_toggle",
-                         GINT_TO_POINTER(0));
-}
-
-static void summary_set_hide_del_msgs_menu (SummaryView *summaryview,
-                                            guint action)
-{
-       GtkWidget *widget;
-
-       widget = gtk_ui_manager_get_widget(summaryview->mainwin->ui_manager, "/Menu/View/HideDelMessages");
        g_object_set_data(G_OBJECT(widget), "dont_toggle",
                          GINT_TO_POINTER(1));
        gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM(widget), action);
@@ -8035,9 +8011,6 @@ void summary_update_unread(SummaryView *summaryview, FolderItem *removed_item)
        guint new, unread, unreadmarked, marked, total;
        guint replied, forwarded, locked, ignored, watched;
        static gboolean tips_initialized = FALSE;
-#if !(GTK_CHECK_VERSION(2,12,0))
-       GtkTooltips *tips = summaryview->tooltips;
-#endif
 
        if (prefs_common.layout_mode != SMALL_LAYOUT) {
                if (tips_initialized) {
Claws Mail