[Xfce4-commits] <postler:master> Use status icons for Forwarded, Replied, Unread

[Christian Dywan]

Updating branch refs/heads/master
         to 50755b7f775a54c351953966c3fcff9fdc2dbac2 (commit)
       from 08b57081914d8903e89e888e415fe27743021ec8 (commit)

commit 50755b7f775a54c351953966c3fcff9fdc2dbac2
Author: Daniel P. Fore <Daniel.P.Fore at gmail.com>
Date:   Sat Nov 6 00:13:57 2010 +0100

    Use status icons for Forwarded, Replied, Unread

 postler/postler-app.vala      |    6 ++++++
 postler/postler-messages.vala |   10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/postler/postler-app.vala b/postler/postler-app.vala
index 1576aff..7ab373d 100644
--- a/postler/postler-app.vala
+++ b/postler/postler-app.vala
@@ -23,11 +23,14 @@ namespace Postler {
     const string STOCK_INTERNET_MAIL = "internet-mail";
     const string STOCK_MAIL_ATTACHMENT = "mail-attachment";
     const string STOCK_MAIL_FORWARD = "mail-forward";
+    const string STOCK_MAIL_FORWARDED = "mail-forwarded";
     const string STOCK_MAIL_SEND = "stock_mail-send";
     const string STOCK_MAIL_SEND_RECEIVE = "mail-send-receive";
     const string STOCK_MAIL_MESSAGE_NEW = "mail-message-new";
+    const string STOCK_MAIL_REPLIED = "mail-replied";
     const string STOCK_MAIL_REPLY_SENDER = "mail-reply-sender";
     const string STOCK_MAIL_REPLY_ALL = "mail-reply-all";
+    const string STOCK_MAIL_UNREAD = "mail-unread";
     const string STOCK_INBOX = "mail-inbox";
     const string STOCK_OUTBOX = "mail-outbox";
     const string STOCK_SENT_MAIL = "mail-sent";
@@ -58,11 +61,14 @@ public class Postler.App : Unique.App {
         { STOCK_FOLDER_SAVED_SEARCH },
         { STOCK_MAIL_ATTACHMENT, null, 0, 0, "stock_attach" },
         { STOCK_MAIL_FORWARD, N_("_Forward") },
+	{ STOCK_MAIL_FORWARDED, "mail-forwarded", 0, 0, STOCK_MAIL_FORWARD },
         { STOCK_MAIL_MESSAGE_NEW, N_("New _Message") },
+	{ STOCK_MAIL_REPLIED, "mail-replied", 0, 0, STOCK_MAIL_REPLY_SENDER },
         { STOCK_MAIL_REPLY_SENDER, N_("Reply To _Sender") },
         { STOCK_MAIL_REPLY_ALL, N_("Reply to _All") },
         { STOCK_MAIL_SEND, N_("_Send Message"), 0, 0, STOCK_MAIL_SEND_RECEIVE },
         { STOCK_MAIL_SEND_RECEIVE, N_("_Receive Mail") },
+	{ STOCK_MAIL_UNREAD, "mail-unread", 0, 0, Gtk.STOCK_NEW },
         { STOCK_IMAGE, null, 0, 0, "gnome-mime-image" },
         { STOCK_INBOX, null, 0, 0, "stock_inbox" },
         { STOCK_OUTBOX, null, 0, 0, "stock_outbox" },
diff --git a/postler/postler-messages.vala b/postler/postler-messages.vala
index 381829c..9169285 100644
--- a/postler/postler-messages.vala
+++ b/postler/postler-messages.vala
@@ -371,7 +371,7 @@ public class Postler.Messages : Gtk.TreeView {
 
     static string parse_flags (string name, out string flagged, out int weight) {
         /* format "unique:2,DFPRST", ordered alphabetically */
-        unowned string status = Gtk.STOCK_NEW;
+        unowned string status = STOCK_MAIL_UNREAD;
         string flags = flags_from_filename (name);
         if (flags == "")
             return status;
@@ -385,14 +385,14 @@ public class Postler.Messages : Gtk.TreeView {
                 flagged = STOCK_EMBLEM_IMPORTANT;
                 break;
             case 'P':
-                status = STOCK_MAIL_FORWARD;
+                status = STOCK_MAIL_FORWARDED;
                 break;
             case 'R':
-                status = STOCK_MAIL_REPLY_SENDER;
+                status = STOCK_MAIL_REPLIED;
                 break;
             case 'S':
                 weight = Pango.Weight.NORMAL;
-                if (status == Gtk.STOCK_NEW)
+                if (status == STOCK_MAIL_UNREAD)
                     status = null;
                 break;
             case 'T':
@@ -466,7 +466,7 @@ public class Postler.Messages : Gtk.TreeView {
                     if (name[0] == '.')
                         continue;
 
-                    string status = Gtk.STOCK_NEW;
+                    string status = STOCK_MAIL_UNREAD;
                     int font_weight = Pango.Weight.BOLD;
                     string flagged = null;
                     if (!folder_new) {