sanity check for bug 601605

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index 9048d28be3d15301ad4c2ea21a28a9429725f671..98c22d34081ee1141aeaf3185450fe0d27b5281f 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -356,6 +356,9 @@ static gint summary_cmp_by_date             (GtkCList               *clist,
 static gint summary_cmp_by_from                (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
+static gint summary_cmp_by_to          (GtkCList               *clist,
+                                        gconstpointer           ptr1, 
+                                        gconstpointer           ptr2);
 static gint summary_cmp_by_subject     (GtkCList               *clist,
                                         gconstpointer           ptr1,
                                         gconstpointer           ptr2);
@@ -398,6 +401,7 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/M_ove..."),               NULL, summary_move_to,  0, NULL},
        {N_("/_Copy..."),               NULL, summary_copy_to,  0, NULL},
        {N_("/_Delete"),                NULL, summary_delete,   0, NULL},
+       {N_("/Cancel a news message"),  NULL, summary_cancel,   0, NULL},
        {N_("/E_xecute"),               NULL, summary_execute_cb,       0, NULL},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Mark"),                  NULL, NULL,             0, "<Branch>"},
@@ -1132,7 +1136,9 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        else
                menu_set_sensitive(ifactory, "/Move...", FALSE);
 
+#if 0
        menu_set_sensitive(ifactory, "/Delete", TRUE);
+#endif
        menu_set_sensitive(ifactory, "/Select all", TRUE);
        menu_set_sensitive(ifactory, "/Copy...", TRUE);
        menu_set_sensitive(ifactory, "/Execute", TRUE);
@@ -1180,6 +1186,9 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        else
                sens = FALSE;
        menu_set_sensitive(ifactory, "/Follow-up and reply to", sens);
+       menu_set_sensitive(ifactory, "/Cancel a news message", sens);
+       menu_set_sensitive(ifactory, "/Delete", !sens);
+
        summary_lock(summaryview);
        menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
        gtk_check_menu_item_set_active
@@ -1970,7 +1979,9 @@ void summary_sort(SummaryView *summaryview,
                cmp_func = (GtkCListCompareFunc)summary_cmp_by_date;
                break;
        case SORT_BY_FROM:
-               cmp_func = (GtkCListCompareFunc)summary_cmp_by_from;
+               cmp_func = summaryview->folder_item->stype != F_OUTBOX ? 
+                       (GtkCListCompareFunc) summary_cmp_by_from :
+                       (GtkCListCompareFunc) summary_cmp_by_to;
                break;
        case SORT_BY_SUBJECT:
                if (summaryview->simplify_subject_preg)
@@ -2187,7 +2198,6 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
 {
        static gchar date_modified[80];
        static gchar *to = NULL;
-       static gchar *from = NULL;
        static gchar col_score[11];
        static gchar buf[BUFFSIZE];
        gint *col_pos = summaryview->col_pos;
@@ -2225,6 +2235,7 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
                                g_free(to);
                                to   = g_strconcat("-->", addr == NULL ? msginfo->to : addr, NULL);
                                text[col_pos[S_COL_FROM]] = to;
+                               g_free(addr);
                        }
                } else {
                        if (cur_account && cur_account->address && !strcmp( addr, cur_account->address)) {
@@ -2241,10 +2252,12 @@ static void summary_set_header(SummaryView *summaryview, gchar *text[],
         * the --> in sent boxes) was executed.
         */
        if (text[col_pos[S_COL_FROM]] != to && prefs_common.use_addr_book && msginfo->from) {
-               g_free(from);
-               from = summary_complete_address(msginfo->from);
-               if (from)
-                       text[col_pos[S_COL_FROM]] = from;
+               gchar *from = summary_complete_address(msginfo->from);
+               if (from) {
+                       g_free(to);
+                       to = from;
+                       text[col_pos[S_COL_FROM]] = to;
+               }                       
        }
 
        if (summaryview->simplify_subject_preg != NULL)
@@ -2851,6 +2864,34 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
                    msginfo->folder->path, msginfo->msgnum);
 }
 
+void summary_cancel(SummaryView *summaryview)
+{
+       MsgInfo * msginfo;
+       GtkCList *clist = GTK_CLIST(summaryview->ctree);
+
+       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                             summaryview->selected);
+       if (!msginfo) return;
+
+       if (!check_permission(summaryview, msginfo))
+               return;
+
+       news_cancel_article(summaryview->folder_item->folder, msginfo);
+       
+       if (summary_is_locked(summaryview)) return;
+
+       summary_lock(summaryview);
+
+       gtk_clist_freeze(clist);
+
+       summary_update_status(summaryview);
+       summary_status_show(summaryview);
+
+       gtk_clist_thaw(clist);
+
+       summary_unlock(summaryview);
+}
+
 void summary_delete(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -4822,6 +4863,33 @@ static gint summary_cmp_by_from(GtkCList *clist,
        return strcasecmp(msginfo1->fromname, msginfo2->fromname);
 }
 
+static gint summary_cmp_by_to(GtkCList *clist,
+                             gconstpointer ptr1, gconstpointer ptr2)
+{
+       const gchar *str1, *str2;
+       const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
+       const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
+       const SummaryView *sv = gtk_object_get_data(GTK_OBJECT(clist), "summaryview");
+       
+       g_return_val_if_fail(sv, -1);
+       
+       str1 = GTK_CELL_TEXT(r1->cell[sv->col_pos[S_COL_FROM]])->text;
+       str2 = GTK_CELL_TEXT(r2->cell[sv->col_pos[S_COL_FROM]])->text;
+
+       if (!str1)
+               return str2 != NULL;
+
+       if (!str2)
+               return -1;
+
+       if (g_strncasecmp(str1, "-->", 3) == 0)
+               str1 += 3;
+       if (g_strncasecmp(str2, "-->", 3) == 0)
+               str2 += 3;
+
+       return strcasecmp(str1, str2);
+}
+
 static gint summary_cmp_by_subject(GtkCList *clist,
                               gconstpointer ptr1, gconstpointer ptr2)
 {
@@ -4945,6 +5013,8 @@ void summary_select_thread(SummaryView *summaryview)
        GtkCTreeNode *node = summaryview->selected;
        GList *cur;
 
+       g_return_if_fail(node != NULL);
+       
        while (GTK_CTREE_ROW(node)->parent != NULL)
                node = GTK_CTREE_ROW(node)->parent;