Merge lp:~elementary-apps/pantheon-mail/window-icon-name into lp:~elementary-apps/pantheon-mail/trunk

[Danielle Foré]

* Set window icon name instead of loading a pixbuf
* Remove now unused const and method from icon-factory.vala

=== modified file 'src/client/components/icon-factory.vala'
--- src/client/components/icon-factory.vala	2015-02-06 20:43:33 +0000
+++ src/client/components/icon-factory.vala	2016-06-05 21:38:04 +0000
@@ -20,10 +20,7 @@
         
         private set { _instance = value; }
     }
-    
-    public const int APPLICATION_ICON_SIZE = 128;
-    public Gdk.Pixbuf application_icon { get; private set; }
-    
+
     public const int UNREAD_ICON_SIZE = 16;
     public const int STAR_ICON_SIZE = 16;
     
@@ -41,9 +38,6 @@
         append_icons_search_path("48x48");
         append_icons_search_path("24x24");
         append_icons_search_path("16x16");
-        
-        // Load icons here.
-        application_icon = load("geary", APPLICATION_ICON_SIZE);
     }
     
     public void init() {
@@ -86,25 +80,7 @@
         else
             icon_theme.append_search_path(icons_dir.get_child(name).get_path());
     }
-    
-    private Gdk.Pixbuf? load(string icon_name, int size, Gtk.IconLookupFlags flags = 0) {
-        // Try looking up IconInfo (to report path in case of error) then load image
-        Gtk.IconInfo? icon_info = icon_theme.lookup_icon(icon_name, size, flags);
-        if (icon_info != null) {
-            try {
-                return icon_info.load_icon();
-            } catch (Error err) {
-                warning("Couldn't load icon %s at %s, falling back to image-missing: %s", icon_name,
-                    icon_info.get_filename(), err.message);
-            }
-        } else {
-            debug("Unable to lookup icon %s, falling back to image-missing...", icon_name);
-        }
-        
-        // Default: missing image icon.
-        return get_missing_icon(size, flags);
-    }
-    
+
     // Attempts to load and return the missing image icon.
     private Gdk.Pixbuf? get_missing_icon(int size, Gtk.IconLookupFlags flags = 0) {
         try {

=== modified file 'src/client/components/main-window.vala'
--- src/client/components/main-window.vala	2016-03-13 17:51:29 +0000
+++ src/client/components/main-window.vala	2016-06-05 21:38:04 +0000
@@ -59,12 +59,7 @@
         spinner.set_progress_monitor(progress_monitor);
         progress_monitor.add(conversation_list_store.preview_monitor);
 
-        GLib.List<Gdk.Pixbuf> pixbuf_list = new GLib.List<Gdk.Pixbuf>();
-        pixbuf_list.append(IconFactory.instance.application_icon);
-        // Use copy() because set_default_icon_list() actually accepts an owned reference
-        // If we didn't hold the pixbufs in memory, would need to use copy_deep()
-        // See https://mail.gnome.org/archives/vala-list/2014-August/msg00022.html
-        set_default_icon_list(pixbuf_list.copy());
+        icon_name = "internet-mail";
 
         delete_event.connect(on_delete_event);
         key_press_event.connect(on_key_press_event);