[gimp] app: set "always-show-image" on some menu items generically

[Michael Natterer <mitch src gnome org>]

commit afedbd001019c2f97186228f4655148146c593f1
Author: Michael Natterer <mitch gimp org>
Date:   Fri Oct 28 23:09:44 2016 +0200

    app: set "always-show-image" on some menu items generically
    
    - the GimpDockBook item which has the current dockable's menu as submenu
    - all menu items which have colors or previews as images

 app/widgets/gimpaction.c   |    6 ++++++
 app/widgets/gimpdockbook.c |    4 +++-
 2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/app/widgets/gimpaction.c b/app/widgets/gimpaction.c
index 5d50fef..54e2334 100644
--- a/app/widgets/gimpaction.c
+++ b/app/widgets/gimpaction.c
@@ -402,6 +402,8 @@ gimp_action_set_proxy (GimpAction *action,
 
           gtk_widget_set_size_request (area, width, height);
           gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), area);
+          gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (proxy),
+                                                     TRUE);
           gtk_widget_show (area);
         }
     }
@@ -441,6 +443,8 @@ gimp_action_set_proxy (GimpAction *action,
                                      width, height, border_width,
                                      FALSE, FALSE, FALSE);
           gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), view);
+          gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (proxy),
+                                                     TRUE);
           gtk_widget_show (view);
         }
     }
@@ -453,6 +457,8 @@ gimp_action_set_proxy (GimpAction *action,
       if (GIMP_IS_VIEW (image) || GIMP_IS_COLOR_AREA (image))
         {
           gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (proxy), NULL);
+          gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (proxy),
+                                                     FALSE);
           g_object_notify (G_OBJECT (action), "icon-name");
         }
     }
diff --git a/app/widgets/gimpdockbook.c b/app/widgets/gimpdockbook.c
index 13950ba..6653751 100644
--- a/app/widgets/gimpdockbook.c
+++ b/app/widgets/gimpdockbook.c
@@ -517,7 +517,7 @@ gimp_dockbook_show_menu (GimpDockbook *dockbook)
 
       if (! child_menu_widget)
         {
-          g_warning ("%s: UI manager '%s' has now widget at path '%s'",
+          g_warning ("%s: UI manager '%s' has no widget at path '%s'",
                      G_STRFUNC, dialog_ui_manager->name, dialog_ui_path);
           return FALSE;
         }
@@ -558,6 +558,8 @@ gimp_dockbook_show_menu (GimpDockbook *dockbook)
 
         gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (parent_menu_widget),
                                        image);
+        gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (parent_menu_widget),
+                                                   TRUE);
         gtk_widget_show (image);
       }