[geary/pantheon_mail: 2/32] color sidebar icons

[Javier Jardón Cabezas <jjardon src gnome org>]

commit b11582da46091ef4f7c83082612c5887b35d9591
Author: Daniel Foré <daniel elementary io>
Date:   Wed Nov 18 11:20:53 2015 -0800

    color sidebar icons

 .../folder-list/folder-list-account-branch.vala    |   14 +++----
 .../folder-list/folder-list-folder-entry.vala      |   43 ++++++++++----------
 2 files changed, 27 insertions(+), 30 deletions(-)
---
diff --git a/src/client/folder-list/folder-list-account-branch.vala 
b/src/client/folder-list/folder-list-account-branch.vala
index 583af86..cb47d17 100644
--- a/src/client/folder-list/folder-list-account-branch.vala
+++ b/src/client/folder-list/folder-list-account-branch.vala
@@ -13,20 +13,18 @@ public class FolderList.AccountBranch : Sidebar.Branch {
     public AccountBranch(Geary.Account account) {
         base(new Sidebar.Header(account.information.nickname),
             Sidebar.Branch.Options.NONE, normal_folder_comparator, special_folder_comparator);
-        
-        bool rtl = Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL;
-        
+
         this.account = account;
-        user_folder_group = new SpecialGrouping(2, "", rtl ? "tag-rtl-symbolic" : "tag-symbolic");
+        user_folder_group = new SpecialGrouping(2, "", "tag");
         folder_entries = new Gee.HashMap<Geary.FolderPath, FolderEntry>();
-        
+
         account.information.notify["nickname"].connect(on_nicknamed_changed);
-        
+
         graft(get_root(), user_folder_group);
-        
+
         entry_removed.connect(on_entry_removed);
     }
-    
+
     ~AccountBranch() {
         account.information.notify["nickname"].disconnect(on_nicknamed_changed);
         entry_removed.disconnect(on_entry_removed);
diff --git a/src/client/folder-list/folder-list-folder-entry.vala 
b/src/client/folder-list/folder-list-folder-entry.vala
index 3d9a7d4..f772b12 100644
--- a/src/client/folder-list/folder-list-folder-entry.vala
+++ b/src/client/folder-list/folder-list-folder-entry.vala
@@ -46,40 +46,39 @@ public class FolderList.FolderEntry : FolderList.AbstractFolderEntry, Sidebar.In
     }
     
     public override string? get_sidebar_icon() {
-        bool rtl = Gtk.Widget.get_default_direction() == Gtk.TextDirection.RTL;
-        
+
         switch (folder.special_folder_type) {
             case Geary.SpecialFolderType.NONE:
-                return rtl ? "tag-rtl-symbolic" : "tag-symbolic";
-            
+                return "tag";
+
             case Geary.SpecialFolderType.INBOX:
-                return "mail-inbox-symbolic";
-            
+                return "mail-inbox";
+
             case Geary.SpecialFolderType.DRAFTS:
-                return "accessories-text-editor-symbolic";
-            
+                return "accessories-text-editor";
+
             case Geary.SpecialFolderType.SENT:
-                return rtl ? "mail-sent-rtl-symbolic" : "mail-sent-symbolic";
-            
+                return "mail-sent";
+
             case Geary.SpecialFolderType.FLAGGED:
-                return "starred-symbolic";
-            
+                return "starred";
+
             case Geary.SpecialFolderType.IMPORTANT:
-                return "task-due-symbolic";
-            
+                return "task-due";
+
             case Geary.SpecialFolderType.ALL_MAIL:
             case Geary.SpecialFolderType.ARCHIVE:
-                return "mail-archive-symbolic";
-            
+                return "mail-archive";
+
             case Geary.SpecialFolderType.SPAM:
-                return rtl ? "mail-spam-rtl-symbolic" : "mail-spam-symbolic";
-            
+                return "edit-flag";
+
             case Geary.SpecialFolderType.TRASH:
-                return "user-trash-symbolic";
-            
+                return "user-trash";
+
             case Geary.SpecialFolderType.OUTBOX:
-                return "mail-outbox-symbolic";
-            
+                return "mail-outbox";
+
             default:
                 assert_not_reached();
         }