2004-09-28 [colin] 0.9.12cvs110.1

	* src/folderview.c
		Sync with HEAD (Contextual Empty trash menu)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 0f02213eec885cc69e9ccceb73e41975a7d3467a..54746008305cae80e89e663aa3fa2c9d32d84596 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2004-09-28 [colin]     0.9.12cvs110.1
+
+       * src/folderview.c
+               Sync with HEAD (Contextual Empty trash menu)
+
 2004-09-28 [colin]     0.9.12cvs108.1
 
        * src/addressbook.c

diff --git a/PATCHSETS b/PATCHSETS
index ccc9213223403a93a2c4223bf8050586161fc9ec..365ca02c78cbbe97f74eddedbba42a05b9ef2399 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -179,3 +179,4 @@
 ( cvs diff -u -r 1.207.2.14 -r 1.207.2.15 src/folderview.c; ) > 0.9.12cvs105.1.patchset
 ( cvs diff -u -r 1.149.2.15 -r 1.149.2.16 src/inc.c; ) > 0.9.12cvs106.1.patchset
 ( cvs diff -u -r 1.60.2.10 -r 1.60.2.11 src/addressbook.c; ) > 0.9.12cvs108.1.patchset
+( cvs diff -u -r 1.207.2.15 -r 1.207.2.16 src/folderview.c; ) > 0.9.12cvs110.1.patchset

diff --git a/configure.ac b/configure.ac
index 93d05716e8c447cdfc1bb0d77320788f3b31f628..30c51b91af99bc56c71dca446e91ed23328c9d73 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=108
+EXTRA_VERSION=110
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/folderview.c b/src/folderview.c
index 3a1301a9744c40a64d5ece74cfaac6d59bc6693a..7c8e9f90b83309013cfb87d09af85135a1bf018a 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -178,6 +178,10 @@ static void mark_all_read_cb            (FolderView    *folderview,
                                          guint           action,
                                          GtkWidget      *widget);
 
+static void folderview_empty_trash_cb  (FolderView     *folderview,
+                                        guint           action,
+                                        GtkWidget      *widget);
+
 static void folderview_search_cb       (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -232,9 +236,15 @@ static GtkItemFactoryEntry folderview_common_popup_entries[] =
        {N_("/Mark all _read"),         NULL, mark_all_read_cb, 0, NULL},
        {N_("/_Search folder..."),      NULL, folderview_search_cb, 0, NULL},
        {N_("/_Properties..."),         NULL, folderview_property_cb, 0, NULL},
-       {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
+       {N_("/Pr_ocessing..."),         NULL, folderview_processing_cb, 0, NULL},
 };
 
+static GtkItemFactoryEntry folder_view_trash_popup_entries[] = {
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
+       {N_("/Empty trash..."),         NULL, folderview_empty_trash_cb, 0, NULL},
+};
+
+
 GtkTargetEntry folderview_drag_types[] =
 {
        {"text/plain", GTK_TARGET_SAME_APP, TARGET_DUMMY}
@@ -1383,6 +1393,15 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
        if (fpopup->set_sensitivity != NULL)
                fpopup->set_sensitivity(fpopup_factory, item);
 
+       if (item == folder->trash &&
+           gtk_item_factory_get_item(fpopup_factory, "/Empty trash...") == NULL) {
+               gtk_item_factory_create_item(fpopup_factory, &folder_view_trash_popup_entries[0], folderview, 1);
+               gtk_item_factory_create_item(fpopup_factory, &folder_view_trash_popup_entries[1], folderview, 1);
+       } else {
+               gtk_item_factory_delete_entry(fpopup_factory, &folder_view_trash_popup_entries[0]);
+               gtk_item_factory_delete_entry(fpopup_factory, &folder_view_trash_popup_entries[1]);
+       }
+       
 #define SET_SENS(name, sens) \
        menu_set_sensitive(fpopup_factory, name, sens)
 
@@ -1391,7 +1410,8 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
                 folderview->selected == folderview->opened);
        SET_SENS("/Properties...", TRUE);
        SET_SENS("/Processing...", item->node->parent != NULL);
-
+       if (item == folder->trash)
+               SET_SENS("/Empty trash...", folder_item_get_msg_list(item) != NULL);
 #undef SET_SENS
 
        popup = gtk_item_factory_get_widget(fpopup_factory, fpopup->path);
@@ -1657,6 +1677,38 @@ void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
        gtk_clist_thaw(GTK_CLIST(ctree));
 }
 
+static void folderview_empty_trash_cb(FolderView *folderview, guint action,
+                                     GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       FolderItem *item;
+       GSList *mlist = NULL;
+       GSList *cur = NULL;
+       if (!folderview->selected) return;
+       
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+       if (item != item->folder->trash) return;
+       
+       if (prefs_common.ask_on_clean) {
+               if (alertpanel(_("Empty trash"),
+                              _("Empty all messages in trash?"),
+                              _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+                       return;
+       }
+       
+       mlist = folder_item_get_msg_list(item);
+       
+       for (cur = mlist ; cur != NULL ; cur = cur->next) {
+               MsgInfo * msginfo = (MsgInfo *) cur->data;
+               partial_mark_for_delete(msginfo);
+               procmsg_msginfo_free(msginfo);
+       }
+
+       folder_item_remove_all_msg(item);
+}
+
 static void folderview_search_cb(FolderView *folderview, guint action,
                                 GtkWidget *widget)
 {