fixes for mbox / changes matcher dialog

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index a8125f19449c8ea230ac72357063ea34eebbb10d..4b543cccd08c46c8eda0b80f74693fe4cb67cc34 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -21,7 +21,6 @@
 
 #include <glib.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkpixmap.h>
@@ -320,6 +319,7 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Reply"),                 NULL, summary_reply_cb, COMPOSE_REPLY, NULL},
        {N_("/Reply to a_ll"),          NULL, summary_reply_cb, COMPOSE_REPLY_TO_ALL, NULL},
+       {N_("/Reply to author"),        NULL, summary_reply_cb, COMPOSE_REPLY_TO_AUTHOR, NULL},
        {N_("/_Forward"),               NULL, summary_reply_cb, COMPOSE_FORWARD, NULL},
        {N_("/Forward as an a_ttachment"),
                                        NULL, summary_reply_cb, COMPOSE_FORWARD_AS_ATTACH, NULL},
@@ -350,7 +350,6 @@ SummaryView *summary_create(void)
        GtkWidget *toggle_arrow;
        GtkWidget *popupmenu;
        GtkItemFactory *popupfactory;
-       GtkBindingSet *binding_set;
        gint n_entries;
        gint i;
 
@@ -492,20 +491,6 @@ SummaryView *summary_create(void)
                                      "<SummaryView>", &popupfactory,
                                      summaryview);
 
-       /* bind keys */
-       binding_set = gtk_binding_set_by_class
-               (GTK_CLIST_CLASS(GTK_OBJECT(ctree)->klass));
-
-       gtk_binding_entry_add_signal(binding_set, GDK_n, GDK_CONTROL_MASK,
-                                    "scroll_vertical", 2,
-                                    GTK_TYPE_ENUM, GTK_SCROLL_STEP_FORWARD,
-                                    GTK_TYPE_FLOAT, 0.0);
-       gtk_binding_entry_add_signal(binding_set, GDK_p, GDK_CONTROL_MASK,
-                                    "scroll_vertical", 2,
-                                    GTK_TYPE_ENUM, GTK_SCROLL_STEP_BACKWARD,
-                                    GTK_TYPE_FLOAT, 0.0);
-       gtk_binding_entry_clear(binding_set, GDK_space, 0);
-
        /* connect signals */
        gtk_signal_connect(GTK_OBJECT(ctree), "tree_select_row",
                           GTK_SIGNAL_FUNC(summary_selected), summaryview);
@@ -838,13 +823,16 @@ static void summary_set_menu_sensitive(SummaryView *summaryview)
        sens = (selection == SUMMARY_SELECTED_MULTIPLE) ? FALSE : TRUE;
        menu_set_sensitive(ifactory, "/Reply",                    sens);
        menu_set_sensitive(ifactory, "/Reply to all",             sens);
+       menu_set_sensitive(ifactory, "/Reply to author",          sens);
        menu_set_sensitive(ifactory, "/Forward",                  sens);
        menu_set_sensitive(ifactory, "/Forward as an attachment", sens);
 
        menu_set_sensitive(ifactory, "/Open in new window", sens);
        menu_set_sensitive(ifactory, "/View source", sens);
        menu_set_sensitive(ifactory, "/Show all header", sens);
-       if (summaryview->folder_item->stype == F_DRAFT)
+       if ((summaryview->folder_item->stype == F_DRAFT) ||
+           (summaryview->folder_item->stype == F_OUTBOX) ||
+           (summaryview->folder_item->stype == F_QUEUE))
                menu_set_sensitive(ifactory, "/Reedit", sens);
 
        menu_set_sensitive(ifactory, "/Save as...", sens);
@@ -1530,6 +1518,9 @@ gint summary_write_cache(SummaryView *summaryview)
        if (!summaryview->folder_item || !summaryview->folder_item->path)
                return -1;
 
+       if (summaryview->folder_item->folder->update_mark != NULL)
+               summaryview->folder_item->folder->update_mark(summaryview->folder_item->folder, summaryview->folder_item);
+
        cachefile = folder_item_get_cache_file(summaryview->folder_item);
        g_return_val_if_fail(cachefile != NULL, -1);
        if ((fps.cache_fp = fopen(cachefile, "w")) == NULL) {
@@ -1653,6 +1644,14 @@ static void summary_set_header(gchar *text[], MsgInfo *msginfo)
                _("(No Subject)");
 }
 
+#define CHANGE_FLAGS(msginfo) \
+{ \
+if (msginfo->folder->folder->change_flags != NULL) \
+msginfo->folder->folder->change_flags(msginfo->folder->folder, \
+                                     msginfo->folder, \
+                                     msginfo); \
+}
+
 static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
                                gboolean new_window)
 {
@@ -1706,6 +1705,9 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
                summaryview->unread--;
        if (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)) {
                MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
+
+               CHANGE_FLAGS(msginfo);
+               
                summary_set_row_marks(summaryview, row);
                gtk_clist_thaw(GTK_CLIST(ctree));
                summary_status_show(summaryview);
@@ -1755,7 +1757,9 @@ void summary_reedit(SummaryView *summaryview)
 
        if (!summaryview->selected) return;
        if (!summaryview->folder_item ||
-           summaryview->folder_item->stype != F_DRAFT) return;
+           (summaryview->folder_item->stype != F_DRAFT &&
+            summaryview->folder_item->stype != F_OUTBOX &&
+            summaryview->folder_item->stype != F_QUEUE)) return;
 
        msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
                                              summaryview->selected);
@@ -1895,6 +1899,9 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->copied--;
        MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED | MSG_MOVE | MSG_COPY);
        MSG_SET_FLAGS(msginfo->flags, MSG_MARKED);
+
+       CHANGE_FLAGS(msginfo);
+
        summary_set_row_marks(summaryview, row);
        debug_print(_("Message %d is marked\n"), msginfo->msgnum);
 }
@@ -1908,6 +1915,7 @@ void summary_mark(SummaryView *summaryview)
                summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
 
        /* summary_step(summaryview, GTK_SCROLL_STEP_FORWARD); */
+       summary_status_show(summaryview);
 }
 
 static void summary_mark_row_as_read(SummaryView *summaryview,
@@ -1924,6 +1932,9 @@ static void summary_mark_row_as_read(SummaryView *summaryview,
        if (MSG_IS_NEW(msginfo->flags) ||
            MSG_IS_UNREAD(msginfo->flags)) {
                MSG_UNSET_FLAGS(msginfo->flags, MSG_NEW | MSG_UNREAD);
+
+               CHANGE_FLAGS(msginfo);
+               
                summary_set_row_marks(summaryview, row);
                debug_print(_("Message %d is marked as being read\n"),
                            msginfo->msgnum);
@@ -1957,12 +1968,16 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
        MSG_UNSET_FLAGS(msginfo->flags, MSG_REPLIED | MSG_FORWARDED);
        if (!MSG_IS_UNREAD(msginfo->flags)) {
                MSG_SET_FLAGS(msginfo->flags, MSG_UNREAD);
+
                gtk_ctree_node_set_pixmap(ctree, row, S_COL_UNREAD,
                                          unreadxpm, unreadxpmmask);
                summaryview->unread++;
                debug_print(_("Message %d is marked as unread\n"),
                            msginfo->msgnum);
        }
+
+       CHANGE_FLAGS(msginfo);
+
        summary_set_row_marks(summaryview, row);
 }
 
@@ -1997,6 +2012,9 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
                        MSG_MOVE |
                        MSG_COPY);
        MSG_SET_FLAGS(msginfo->flags, MSG_DELETED);
+
+       CHANGE_FLAGS(msginfo);
+
        summaryview->deleted++;
 
        if (!prefs_common.immediate_exec)
@@ -2088,6 +2106,9 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
                        MSG_DELETED |
                        MSG_MOVE |
                        MSG_COPY);
+
+       CHANGE_FLAGS(msginfo);
+
        summary_set_row_marks(summaryview, row);
 
        debug_print(_("Message %s/%d is unmarked\n"),
@@ -2124,6 +2145,7 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
                MSG_SET_FLAGS(msginfo->flags, MSG_MOVE);
                summaryview->moved++;
        }
+
        if (!prefs_common.immediate_exec)
                summary_set_row_marks(summaryview, row);
 
@@ -2185,6 +2207,7 @@ static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
                MSG_SET_FLAGS(msginfo->flags, MSG_COPY);
                summaryview->copied++;
        }
+
        if (!prefs_common.immediate_exec)
                summary_set_row_marks(summaryview, row);
 
@@ -2320,7 +2343,8 @@ void summary_execute(SummaryView *summaryview)
 
        gtk_clist_freeze(clist);
 
-       if (prefs_common.enable_thread)
+       if (summaryview->folder_item->prefs->enable_thread)
+               /*      if (prefs_common.enable_thread) */
                summary_unthread_for_exec(summaryview);
 
        summary_execute_move(summaryview);
@@ -2343,7 +2367,8 @@ void summary_execute(SummaryView *summaryview)
                node = next;
        }
 
-       if (prefs_common.enable_thread)
+       if (summaryview->folder_item->prefs->enable_thread)
+               /*      if (prefs_common.enable_thread) */
                summary_thread_build(summaryview);
 
        summaryview->selected = clist->selection ?
@@ -2457,6 +2482,7 @@ static void summary_execute_copy_func(GtkCTree *ctree, GtkCTreeNode *node,
                        g_slist_append(summaryview->mlist, msginfo);
 
                MSG_UNSET_FLAGS(msginfo->flags, MSG_COPY);
+               
                summary_set_row_marks(summaryview, node);
        }
 }
@@ -2479,6 +2505,11 @@ static void summary_execute_delete(SummaryView *summaryview)
 
        if (!summaryview->mlist) return;
 
+       for(cur = summaryview->mlist ; cur != NULL ; cur = cur->next) {
+               MsgInfo * msginfo = cur->data;
+               MSG_UNSET_FLAGS(msginfo->flags, MSG_DELETED);
+       }
+
        folder_item_move_msgs_with_dest(trash, summaryview->mlist);
 
        for (cur = summaryview->mlist; cur != NULL; cur = cur->next)
@@ -2933,6 +2964,9 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        case S_COL_MARK:
                if (MSG_IS_MARKED(msginfo->flags)) {
                        MSG_UNSET_FLAGS(msginfo->flags, MSG_MARKED);
+
+                       CHANGE_FLAGS(msginfo);
+                       
                        summary_set_row_marks(summaryview, row);
                } else
                        summary_mark_row(summaryview, row);
@@ -3002,31 +3036,44 @@ static void summary_reply_cb(SummaryView *summaryview, guint action,
 
        switch ((ComposeReplyMode)action) {
        case COMPOSE_REPLY:
-               compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, FALSE);
                break;
        case COMPOSE_REPLY_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE);
+               compose_reply(msginfo, TRUE, FALSE, FALSE);
                break;
        case COMPOSE_REPLY_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE);
+               compose_reply(msginfo, FALSE, FALSE, FALSE);
                break;
        case COMPOSE_REPLY_TO_ALL:
-               compose_reply(msginfo, prefs_common.reply_with_quote, TRUE);
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             TRUE, FALSE);
                break;
        case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, TRUE);
+               compose_reply(msginfo, TRUE, TRUE, FALSE);
                break;
        case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, TRUE);
+               compose_reply(msginfo, FALSE, TRUE, FALSE);
+               break;
+       case COMPOSE_REPLY_TO_AUTHOR:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_AUTHOR_WITH_QUOTE:
+               compose_reply(msginfo, TRUE, FALSE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_AUTHOR_WITHOUT_QUOTE:
+               compose_reply(msginfo, FALSE, FALSE, TRUE);
                break;
        case COMPOSE_FORWARD:
-               compose_forward(msginfo, FALSE);
+               compose_forward(NULL, msginfo, FALSE);
                break;
        case COMPOSE_FORWARD_AS_ATTACH:
-               compose_forward(msginfo, TRUE);
+               compose_forward(NULL, msginfo, TRUE);
                break;
        default:
-               compose_reply(msginfo, prefs_common.reply_with_quote, FALSE);
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, FALSE);
        }
 
        summary_set_marks_selected(summaryview);
@@ -3047,13 +3094,15 @@ static void summary_add_sender_to_cb (SummaryView                       *summaryview,
        GtkMenuShell    *menushell;
        GtkWidget               *menu;
        GtkWidget               *menuitem;
-       GList                   *child = menushell->children;
+       GList                   *child;
        gboolean                found = FALSE;
        MsgInfo                 *msginfo;
        gchar                   *from_address;
 
        menushell = GTK_MENU_SHELL(summaryview->popupmenu);
-       g_return_if_fail(GTK_MENU_SHELL(summaryview->popupmenu));
+       g_return_if_fail(menushell != NULL);
+       child = menushell->children;
+       g_return_if_fail(child);
 
        /* we're iterating each menu item searching for the one with 
         * a "contacts" object data. if not found add the menu,