Merge lp:~mefrio-g/granite/fix-990203 into lp:~elementary-pantheon/granite/granite

[Mario Guerriero]

[Sergey "Shnatsel" Davidoff (shnatsel)]

What happens if the theme doesn't have an "application-menu" icon?

[Mario Guerriero (mefrio-g)]

It is showed a blank icon

[Sergey "Shnatsel" Davidoff (shnatsel)]

So there will be no fallback, just a blank icon on all themes except elementary? Doesn't sound like a great idea.

[Danielle Foré (danrabbit)]

We could also consider shipping "application-menu" with granite instead of in the icon theme. I think it would make sense since it's actually granite that requires it.

filed a bug here: https://bugs.launchpad.net/granite/+bug/990700

[Cody Garver (codygarver)]

review: Approve

=== modified file 'lib/Widgets/AppMenu.vala'
--- lib/Widgets/AppMenu.vala	2012-01-15 21:04:11 +0000
+++ lib/Widgets/AppMenu.vala	2012-04-28 11:11:18 +0000
@@ -29,12 +29,12 @@
 
         public AppMenu (Gtk.Menu menu) {
         
-            base (new Image.from_stock (Stock.PROPERTIES, IconSize.MENU), _("Menu"), menu);
+            base (new Image.from_icon_name ("application-menu", IconSize.MENU), _("Menu"), menu);
         }
 
         public AppMenu.with_app (Granite.Application? application, Gtk.Menu menu) {
         
-            base (new Image.from_stock (Stock.PROPERTIES, IconSize.MENU), _("Menu"), menu);
+            base (new Image.from_icon_name ("application-menu", IconSize.MENU), _("Menu"), menu);
             
             this.add_items (menu);
             
@@ -48,7 +48,7 @@
          **/
         public AppMenu.with_urls (Gtk.Menu menu, string help_url, string translate_url, string bug_url) {
             critical("This is a deprecated creation method: AppMenu.with_urls");
-            base (new Image.from_stock (Stock.PROPERTIES, IconSize.MENU), _("Menu"), menu);
+            base (new Image.from_icon_name ("application-menu", IconSize.MENU), _("Menu"), menu);
         }
         
         public void add_items (Gtk.Menu menu) {