From 0651f228cef01a6c3e4758a991cace1cd7721031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Mon, 24 Sep 2012 09:57:46 +0200
Subject: [PATCH] windowmenu: do not display desktop icon when no window is
 active
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* desktop icon is of no use
* desktop icon confuses when using showdesktop plugin

Upstream-Status: Pending

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 plugins/windowmenu/windowmenu.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
index c96123a..9404021 100644
--- a/plugins/windowmenu/windowmenu.c
+++ b/plugins/windowmenu/windowmenu.c
@@ -256,7 +256,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin)
   g_signal_connect (G_OBJECT (plugin->button), "toggled",
       G_CALLBACK (window_menu_plugin_menu), plugin);
 
-  plugin->icon = xfce_panel_image_new_from_source ("user-desktop");
+  plugin->icon = xfce_panel_image_new_from_source (NULL);
   gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon);
   gtk_widget_show (plugin->icon);
 }
@@ -634,7 +634,7 @@ window_menu_plugin_active_window_changed (WnckScreen       *screen,
           /* skip 'fake' windows */
           type = wnck_window_get_window_type (window);
           if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK)
-            goto show_desktop_icon;
+            goto show_no_icon;
 
           /* get the window icon and set the tooltip */
           gtk_widget_set_tooltip_text (GTK_WIDGET (icon),
@@ -648,11 +648,11 @@ window_menu_plugin_active_window_changed (WnckScreen       *screen,
         }
       else
         {
-          show_desktop_icon:
+          show_no_icon:
 
-          /* desktop is shown right now */
-          xfce_panel_image_set_from_source (icon, "user-desktop");
-          gtk_widget_set_tooltip_text (GTK_WIDGET (icon), _("Desktop"));
+          /* no icon is shown right now */
+          xfce_panel_image_set_from_source (icon, NULL);
+          gtk_widget_set_tooltip_text (GTK_WIDGET (icon), _("No Windows"));
         }
     }
 }
-- 
1.7.6.5

