[Xfce4-commits] <xfce4-panel:devel> Hide the menu icons if the user set the GtkIconSize to invalid.

[Nick Schermer]

Updating branch refs/heads/devel
         to 0fe29530a8472b4de39d25ec7349b1e5778a4629 (commit)
       from 1e216d9d455eb76ccf8931fbdb096eb83695288c (commit)

commit 0fe29530a8472b4de39d25ec7349b1e5778a4629
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jun 7 19:43:55 2009 +0200

    Hide the menu icons if the user set the GtkIconSize to invalid.

 plugins/launcher/launcher.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index 98ce77a..e41b88f 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -894,7 +894,8 @@ launcher_plugin_menu_construct (LauncherPlugin *plugin)
 
       /* set the icon if one is set */
       icon_name = xfce_menu_item_get_icon_name (item);
-      if (IS_STRING (icon_name))
+      if (IS_STRING (icon_name)
+          && plugin->menu_icon_size != GTK_ICON_SIZE_INVALID)
         {
           image = gtk_image_new_from_icon_name (icon_name, plugin->menu_icon_size);
           gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image);