Changeset 491

Timestamp:

06/06/06 00:00:27

Author:

pvanhoof

Message:

Deleting messages

Files:

• trunk/libtinymail-camel/tny-msg-folder.c (modified) (3 diffs)
• trunk/libtinymail/tny-list-iface.c (modified) (1 diff)
• trunk/libtinymail/tny-msg-folder-iface.c (modified) (1 diff)
• trunk/libtinymail/tny-msg-folder-iface.h (modified) (2 diffs)
• trunk/tinymail/tny-summary-window.c (modified) (5 diffs)

trunk/libtinymail-camel/tny-msg-folder.c

@@ -147 +147 @@
-}
-
+
+static void 
+tny_msg_folder_remove_message (TnyMsgFolderIface *self, TnyMsgHeaderIface *header)
+{
+        TnyMsgFolderPriv *priv = TNY_MSG_FOLDER_GET_PRIVATE (TNY_MSG_FOLDER (self));
+        const gchar *id;
+
+        g_mutex_lock (priv->folder_lock);
+
+        if (!priv->folder || !priv->loaded)
+                load_folder_no_lock (priv);
+
+        id = tny_msg_header_iface_get_uid (TNY_MSG_HEADER_IFACE (header));
+        camel_folder_delete_message (priv->folder, id);
+
+        g_mutex_unlock (priv->folder_lock);
+
+        return;
+}
+
+static void 
+tny_msg_folder_expunge (TnyMsgFolderIface *self)
+{
+        TnyMsgFolderPriv *priv = TNY_MSG_FOLDER_GET_PRIVATE (TNY_MSG_FOLDER (self));
+        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+
+        g_mutex_lock (priv->folder_lock);
+
+        if (!priv->folder || !priv->loaded)
+                load_folder_no_lock (priv);
+        
+        camel_folder_sync (priv->folder, TRUE, &ex);
+
+        g_mutex_unlock (priv->folder_lock);
+
+        return;
+}
+
+
-CamelFolder*
-_tny_msg_folder_get_camel_folder (TnyMsgFolderIface *self)
@@ -156 +195 @@
-
-        if (!priv->folder || !priv->loaded)
-
+_no_lock
-        retval = priv->folder;
-
@@ -908 +947 @@
-        klass->refresh_async_func = tny_msg_folder_refresh_async;
-        klass->refresh_func = tny_msg_folder_refresh;
+        klass->remove_message_func = tny_msg_folder_remove_message;
+        klass->expunge_func = tny_msg_folder_expunge;
-
-        return;

trunk/libtinymail/tny-list-iface.c

@@ -68 +68 @@
- * @item: the item to remove
- *
-
+
+
+
- **/
-void 

trunk/libtinymail/tny-msg-folder-iface.c

@@ -25 +25 @@
-guint *tny_msg_folder_iface_signals;
-
+
+/**
+ * tny_msg_folder_iface_expunge:
+ * @self: a TnyMsgFolderIface object
+ *
+ * Sync changes made to a folder to its backing store, 
+ * expunging deleted messages as well.
+ **/
+void 
+tny_msg_folder_iface_expunge (TnyMsgFolderIface *self)
+{
+        TNY_MSG_FOLDER_IFACE_GET_CLASS (self)->expunge_func (self);
+        return;
+}
+
+/**
+ * tny_msg_folder_iface_remove_message:
+ * @self: a TnyMsgFolderIface object
+ * @header: the header of the message to remove
+ *
+ * Remove a message from a folder
+ **/
+void 
+tny_msg_folder_iface_remove_message (TnyMsgFolderIface *self, TnyMsgHeaderIface *header)
+{
+        TNY_MSG_FOLDER_IFACE_GET_CLASS (self)->remove_message_func (self, header);
+        return;
+}
-
-

trunk/libtinymail/tny-msg-folder-iface.h

@@ -78 +78 @@
-
-        /* Methods */
+        void (*remove_message_func) (TnyMsgFolderIface *self, TnyMsgHeaderIface *header);
+        void (*expunge_func)        (TnyMsgFolderIface *self);
+
-        const TnyListIface*
-                      (*get_folders_func)  (TnyMsgFolderIface *self);
@@ -111 +114 @@
-GType          tny_msg_folder_iface_get_type     (void);
-
+void tny_msg_folder_iface_remove_message (TnyMsgFolderIface *self, TnyMsgHeaderIface *header);
+void tny_msg_folder_iface_expunge (TnyMsgFolderIface *self);
+
-const TnyListIface*
-               tny_msg_folder_iface_get_folders  (TnyMsgFolderIface *self);

trunk/tinymail/tny-summary-window.c

@@ -26 +26 @@
-#include <string.h>
-#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
-
-#include <tny-platform-factory-iface.h>
@@ -206 +207 @@
-
-static void
+on_header_view_key_press_event (GtkTreeView *header_view, GdkEventKey *event, gpointer user_data)
+{
+        if (event->keyval == GDK_Delete)
+        {
+                TnySummaryWindow *self  = user_data;
+                TnySummaryWindowPriv *priv = TNY_SUMMARY_WINDOW_GET_PRIVATE (self);
+                GtkTreeSelection *selection = gtk_tree_view_get_selection (header_view);
+                GtkTreeModel *model, *mymodel, *sortable;
+                GtkTreeIter iter;
+
+                if (G_LIKELY (gtk_tree_selection_get_selected (selection, &model, &iter)))
+                {
+                        TnyMsgHeaderIface *header;
+
+                        gtk_tree_model_get (model, &iter, 
+                                TNY_MSG_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+                                &header, -1);
+
+                        if (G_LIKELY (header))
+                        {
+                                GtkWidget *dialog = gtk_message_dialog_new (NULL, 
+                                        GTK_DIALOG_MODAL,
+                                        GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO, 
+                                        _("This will remove the message with subject \"%s\""),
+                                        tny_msg_header_iface_get_subject (header));
+
+                                if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
+                                {
+                                        TnyMsgFolderIface *folder;
+                                        const TnyMsgIface *msg;
+
+                                        if (GTK_IS_TREE_MODEL_SORT (model))
+                                        {
+                                                mymodel = gtk_tree_model_sort_get_model 
+                                                        (GTK_TREE_MODEL_SORT (model));
+                                        } else mymodel = model;
+
+                                        tny_list_iface_remove (TNY_LIST_IFACE (mymodel), header);
+
+                                        folder = (TnyMsgFolderIface*)tny_msg_header_iface_get_folder (header);
+                                        tny_msg_folder_iface_remove_message (folder, header);
+
+                                        /* This demo-ui does not support hiding marked-as-deleted 
+                                           messages. A normal deletion will only *mark* a message
+                                           as deleted. That way undeletion is still possible.
+
+                                           You shouldn't *use* this demo-ui, so I'm doing destructive
+                                           irreversible deletes: I immediately expunge the folder! */
+
+                                        tny_msg_folder_iface_expunge (folder);
+                                }
+
+                                gtk_widget_destroy (dialog);
+                        }
+                }
+                
+        }
+
+        return;
+}
+
+static void
-on_header_view_tree_selection_changed (GtkTreeSelection *selection, 
-                gpointer user_data)
@@ -227 +290 @@
-                        const TnyMsgFolderIface *folder;
-                        const TnyMsgIface *msg;
-
-
-
-
-
+
+
+
-
-                        tny_msg_view_iface_set_msg (priv->msg_view, TNY_MSG_IFACE (msg));       
@@ -388 +449 @@
-                if (G_LIKELY (header))
-                {
-/* Debugging/testing purposes 
-                        GtkTreeModel *oldmodel = gtk_tree_model_sort_get_model 
-                                (GTK_TREE_MODEL_SORT (model));
-                        tny_list_iface_remove (TNY_LIST_IFACE (oldmodel), header);
-
-*/
-                        const TnyMsgFolderIface *folder;
-                        const TnyMsgIface *msg;
@@ -591 +646 @@
-        g_signal_connect(G_OBJECT (priv->header_view), "row-activated", 
-                G_CALLBACK (on_header_view_tree_row_activated), priv->header_view);
+
+        g_signal_connect(G_OBJECT (priv->header_view), "key-press-event", 
+                G_CALLBACK (on_header_view_key_press_event), self);
+
-        g_signal_connect (G_OBJECT (select), "changed",
-                G_CALLBACK (on_header_view_tree_selection_changed), self);