Attachment 156709 Details for Bug 235769 – patch

[patch] patch

mail-notification-notify-delete.patch (text/plain), 4.14 KB, created by David Woodhouse on 2007-06-11 13:56:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Woodhouse

Created: 2007-06-11 13:56:31 UTC

Size: 4.14 KB

patch

obsolete

>--- mail-notification-4.0/help/C/mail-notification.xml~	2007-01-17 14:54:22.000000000 +0000
>+++ mail-notification-4.0/help/C/mail-notification.xml	2007-06-11 14:44:37.000000000 +0100
>@@ -1251,6 +1251,10 @@
> 	      <entry><guilabel>Mark as Spam</guilabel></entry>
> 	      <entry><parameter>mark-as-spam-command</parameter></entry>
> 	    </row>
>+	    <row>
>+	      <entry><guilabel>Delete</guilabel></entry>
>+	      <entry><parameter>mark-as-deleted-command</parameter></entry>
>+	    </row>
> 	  </tbody>
> 	</tgroup>
>       </table>
>--- mail-notification-4.0/src/mn-evolution-message.gob~	2007-01-17 14:08:24.000000000 +0000
>+++ mail-notification-4.0/src/mn-evolution-message.gob	2007-06-11 14:39:47.000000000 +0100
>@@ -123,4 +123,10 @@ class MN:Evolution:Message from MN:Messa
>   {
>     return self_set_flags(SELF(message), CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_JUNK | CAMEL_MESSAGE_JUNK_LEARN, err);
>   }
>+
>+  override (MN:Message) gboolean
>+    mark_as_deleted_impl (MNMessage *message, GError **err)
>+  {
>+    return self_set_flags(SELF(message), CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_DELETED, err);
>+  }
> }
>--- mail-notification-4.0/src/mn-mailbox.gob~	2007-01-17 14:38:24.000000000 +0000
>+++ mail-notification-4.0/src/mn-mailbox.gob	2007-06-11 14:39:16.000000000 +0100
>@@ -141,6 +141,9 @@ class MN:Mailbox from G:Object (abstract
>   public char *mark_as_spam_command destroywith g_free;
>   property STRING mark_as_spam_command (link, flags = MN_MAILBOX_PARAM_PERMANENT);
> 
>+  public char *mark_as_deleted_command destroywith g_free;
>+  property STRING mark_as_deleted_command (link, flags = MN_MAILBOX_PARAM_PERMANENT);
>+
>   public char *stock_id destroywith g_free;
>   property STRING stock_id (link, export);
> 
>--- mail-notification-4.0/src/mn-popup.gob~	2007-01-17 14:39:16.000000000 +0000
>+++ mail-notification-4.0/src/mn-popup.gob	2007-06-11 14:41:02.000000000 +0100
>@@ -96,6 +96,14 @@ class MN:Popup from Notify:Notification
> 				     self_mark_as_spam_cb,
> 				     NULL,
> 				     NULL);
>+    if (mn_message_can_mark_as_deleted(selfp->message))
>+      notify_notification_add_action(NOTIFY_NOTIFICATION(self),
>+				     "delete",
>+				     /* translators: header capitalization */
>+				     _("Delete"),
>+				     self_mark_as_deleted_cb,
>+				     NULL,
>+				     NULL);
> 
>     notify_notification_set_timeout(NOTIFY_NOTIFICATION(self), self_get_conf_timeout());
> 
>@@ -156,6 +164,23 @@ class MN:Popup from Notify:Notification
>   }
> 
>   private void
>+    mark_as_deleted_cb (NotifyNotification *notification, char *id, gpointer user_data)
>+  {
>+    Self *self = SELF(notification);
>+    GError *err = NULL;
>+
>+    GDK_THREADS_ENTER();
>+
>+    if (! mn_message_mark_as_deleted(selfp->message, &err))
>+      {
>+	mn_error_dialog(NULL, _("Unable to delete message"), "%s", err->message);
>+	g_error_free(err);
>+      }
>+
>+    GDK_THREADS_LEAVE();
>+  }
>+
>+  private void
>     closed_h (NotifyNotification *notification, gpointer user_data)
>   {
>     Self *self = SELF(notification);
>--- mail-notification-4.0/src/mn-message.gob~	2007-01-17 14:38:56.000000000 +0000
>+++ mail-notification-4.0/src/mn-message.gob	2007-06-11 14:43:33.000000000 +0100
>@@ -425,6 +425,44 @@ class MN:Message from G:Object
>   virtual private gboolean
>     mark_as_spam_impl (self, GError **err);
> 
>+  virtual public gboolean
>+    can_mark_as_deleted (self)
>+  {
>+    return mn_mailbox_has_command(self->mailbox, "mark-as-deleted") || self_can_mark_as_deleted_impl(self);
>+  }
>+
>+  virtual private gboolean
>+    can_mark_as_deleted_impl (self)
>+  {
>+    return SELF_GET_CLASS(self)->mark_as_deleted_impl != NULL;
>+  }
>+
>+  private gboolean
>+    mark_as_deleted_real (self, GError **err)
>+  {
>+    gboolean status;
>+
>+    if (self_execute_command(self, "mark-as-deleted", &status, err))
>+      return status;
>+    else
>+      return self_mark_as_deleted_impl(self, err);
>+  }
>+
>+  public gboolean
>+    mark_as_deleted (self, GError **err)
>+  {
>+    if (self_mark_as_deleted_real(self, err))
>+      {
>+	mn_mailbox_mark_as_read(self);
>+	return TRUE;
>+      }
>+    else
>+      return FALSE;
>+  }
>+
>+  virtual private gboolean
>+    mark_as_deleted_impl (self, GError **err);
>+
>   public MNMessage *
>     new (MN:Mailbox *mailbox (check null type),
> 	 const char *error,

Actions: View | Diff

Attachments on bug 235769: 156709