Merge lp:~xapantu/granite/fix-956544 into lp:~elementary-pantheon/granite/granite

[xapantu]

Fix bug #956544

[Victor Martinez (victored)]

It looks fine to me Lucas. Have you considered using GLib.Icon for the fallbacks?

[xapantu (xapantu)]

Ah, yes, we can use gtk_icon_theme_choose_icon, I didn't know this function. I updated the branch.

[lp:~xapantu/granite/fix-956544]

204. By xapantu on 2012-03-20

Avoid a few lines of cose using choose_icon directly from gtk

[Victor Martinez (victored)]

I didn't know about that function either :P

Looks perfect Lucas.

review: Approve

=== modified file 'lib/Widgets/DynamicNotebook.vala'
--- lib/Widgets/DynamicNotebook.vala	2012-03-19 18:39:32 +0000
+++ lib/Widgets/DynamicNotebook.vala	2012-03-20 18:16:21 +0000
@@ -158,6 +158,27 @@
     public signal void switch_page (Tab tab);
     public signal void page_removed (Tab tab);
 
+    // FIXME: probably needs to be moved somewhere with a public API
+    Gdk.Pixbuf load_pixbuf_with_fallbacks (string[] icons_name, int icon_size) {
+        Gdk.Pixbuf pixbuf = null;
+        try {
+            var icon_info = Gtk.IconTheme.get_default ().choose_icon (icons_name, icon_size, 0);
+            if (icon_info != null) {
+                pixbuf = icon_info.load_symbolic_for_context (button_context, null);
+            }
+        }
+        catch (Error e) {
+            try {
+                pixbuf = Gtk.IconTheme.get_default ().load_icon ("gtk-missing-image", icon_size, 0);
+            }
+            catch (Error e) {
+                error ("gtk-missing-image not found");
+            }
+        }
+        return pixbuf;
+    }
+
+
     public Tabs () {
         tabs = new Gee.ArrayList<Tab>();
         
@@ -175,11 +196,6 @@
             }
         }
 
-        try {
-            close_pixbuf = Gtk.IconTheme.get_default ().load_icon ("gtk-close", close_size, 0);
-        }
-        catch (Error e) {
-        }
 
         height_request = 35;
         width_request = (int)(2*max_width);
@@ -229,6 +245,7 @@
             }
             return true;
         });
+        close_pixbuf = load_pixbuf_with_fallbacks ( {"window-close-symbolic", "window-close", "gtk-close"}, close_size);
     }
 
     public void add_tab (Tab tab) {