[geary] Use sym. icons for read/unread starred/unstarred mail: Refs bgo#720771

[Jim Nelson <jnelson src gnome org>]

commit 01dfbc077907ca53ae7e2b6c5127fe5be18030a2
Author: Wolfgang Steitz <wolfer7 web de>
Date:   Wed Feb 12 14:49:09 2014 -0800

    Use sym. icons for read/unread starred/unstarred mail: Refs bgo#720771

 icons/CMakeLists.txt                               |    4 -
 icons/read-symbolic.svg                            |   66 ------------------
 icons/star-symbolic.svg                            |   46 -------------
 icons/unread-symbolic.svg                          |   71 --------------------
 icons/unstarred-symbolic.svg                       |   46 -------------
 .../formatted-conversation-data.vala               |    4 +-
 .../conversation-viewer/conversation-web-view.vala |    4 +-
 .../folder-list/folder-list-folder-entry.vala      |    2 +-
 8 files changed, 5 insertions(+), 238 deletions(-)
---
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index ae25a14..2b5f3a7 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -11,7 +11,6 @@ set(ICON_FILES
     inbox-symbolic.svg
     marker-symbolic.svg
     outbox-symbolic.svg
-    read-symbolic.svg
     reply-all-symbolic.svg
     reply-all-rtl-symbolic.svg
     reply-symbolic.svg
@@ -20,11 +19,8 @@ set(ICON_FILES
     sent-rtl-symbolic.svg
     spam-symbolic.svg
     spam-rtl-symbolic.svg
-    star-symbolic.svg
     tag-symbolic.svg
     tag-rtl-symbolic.svg
-    unread-symbolic.svg
-    unstarred-symbolic.svg
 )
 
 install(FILES ${ICON_FILES} DESTINATION ${ICONS_DEST})
diff --git a/src/client/conversation-list/formatted-conversation-data.vala 
b/src/client/conversation-list/formatted-conversation-data.vala
index a52c7ac..586b97f 100644
--- a/src/client/conversation-list/formatted-conversation-data.vala
+++ b/src/client/conversation-list/formatted-conversation-data.vala
@@ -316,7 +316,7 @@ public class FormattedConversationData : Geary.BaseObject {
             // Unread indicator.
             if (is_unread || hover) {
                 Gdk.Pixbuf read_icon = IconFactory.instance.load_symbolic(
-                    is_unread ? "unread-symbolic" : "read-symbolic",
+                    is_unread ? "mail-unread-symbolic" : "mail-read-symbolic",
                     IconFactory.UNREAD_ICON_SIZE, widget.get_style_context());
                 Gdk.cairo_set_source_pixbuf(ctx, read_icon, cell_area.x + LINE_SPACING, unread_y);
                 ctx.paint();
@@ -326,7 +326,7 @@ public class FormattedConversationData : Geary.BaseObject {
             if (is_flagged || hover) {
                 int star_y = cell_area.y + (cell_area.height / 2) + (display_preview ? LINE_SPACING : 0);
                 Gdk.Pixbuf starred_icon = IconFactory.instance.load_symbolic(
-                    is_flagged ? "starred-symbolic" : "unstarred-symbolic",
+                    is_flagged ? "starred-symbolic" : "non-starred-symbolic",
                     IconFactory.STAR_ICON_SIZE, widget.get_style_context());
                 Gdk.cairo_set_source_pixbuf(ctx, starred_icon, cell_area.x + LINE_SPACING, star_y);
                 ctx.paint();
diff --git a/src/client/conversation-viewer/conversation-web-view.vala 
b/src/client/conversation-viewer/conversation-web-view.vala
index fbd7de7..88e7acc 100644
--- a/src/client/conversation-viewer/conversation-web-view.vala
+++ b/src/client/conversation-viewer/conversation-web-view.vala
@@ -143,8 +143,8 @@ public class ConversationWebView : WebKit.WebView {
         
         // Load the icons.
         set_icon_src("#email_template .menu .icon", "go-down-symbolic");
-        set_icon_src("#email_template .starred .icon", "star-symbolic");
-        set_icon_src("#email_template .unstarred .icon", "unstarred-symbolic");
+        set_icon_src("#email_template .starred .icon", "starred-symbolic");
+        set_icon_src("#email_template .unstarred .icon", "non-starred-symbolic");
         set_icon_src("#email_template .attachment.icon", "mail-attachment-symbolic");
         set_icon_src("#email_template .close_show_images", "close-symbolic");
         set_icon_src("#link_warning_template .close_link_warning", "close-symbolic");
diff --git a/src/client/folder-list/folder-list-folder-entry.vala 
b/src/client/folder-list/folder-list-folder-entry.vala
index 99e93d0..64b4f61 100644
--- a/src/client/folder-list/folder-list-folder-entry.vala
+++ b/src/client/folder-list/folder-list-folder-entry.vala
@@ -60,7 +60,7 @@ public class FolderList.FolderEntry : FolderList.AbstractFolderEntry, Sidebar.In
                 return new ThemedIcon(rtl ? "sent-rtl-symbolic" : "sent-symbolic");
             
             case Geary.SpecialFolderType.FLAGGED:
-                return new ThemedIcon("star-symbolic");
+                return new ThemedIcon("starred-symbolic");
             
             case Geary.SpecialFolderType.IMPORTANT:
                 return new ThemedIcon("task-due-symbolic");