Merge lp:~midori/midori/openMenuSymbolic into lp:midori

[Cris Dywan]

Use open-menu-(symbolic) for app menu

[Danielle Foré (danrabbit)]

This doesn't seem to use fallbacks correctly because of using gicon. Normally it would fallback from open-menu-symbolic to open-menu (just by using gtk image from icon name), but instead it's falling back across icon themes to find open-menu-symbolic (which is not desirable, imo)

[Cris Dywan (kalikiana)]

I don't know what else to do then. This is how GTK+ implements icon themes.

Unmerged revisions

7032. By Cris Dywan on 2015-08-30

Use open-menu-(symbolic) for app menu

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2015-07-11 16:03:43 +0000
+++ midori/midori-browser.c	2015-08-30 18:05:44 +0000
@@ -6129,13 +6129,15 @@
     gtk_action_group_add_action_with_accel (browser->action_group, action, "");
     g_object_unref (action);
 
+    GIcon* icon = g_themed_icon_new_with_default_fallbacks ("open-menu-symbolic");
     action = g_object_new (KATZE_TYPE_ARRAY_ACTION,
         "name", "CompactMenu",
         "label", _("_Menu"),
-        "stock-id", GTK_STOCK_PROPERTIES,
+        "gicon", icon,
         "tooltip", _("Menu"),
         "array", katze_array_new (KATZE_TYPE_ITEM),
         NULL);
+    g_object_unref (icon);
     g_object_connect (action,
                       "signal::populate-popup",
                       _action_compact_menu_populate_popup, browser,