1*4882a593SmuzhiyunFrom 0651f228cef01a6c3e4758a991cace1cd7721031 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> 3*4882a593SmuzhiyunDate: Mon, 24 Sep 2012 09:57:46 +0200 4*4882a593SmuzhiyunSubject: [PATCH] windowmenu: do not display desktop icon when no window is 5*4882a593Smuzhiyun active 6*4882a593SmuzhiyunMIME-Version: 1.0 7*4882a593SmuzhiyunContent-Type: text/plain; charset=UTF-8 8*4882a593SmuzhiyunContent-Transfer-Encoding: 8bit 9*4882a593Smuzhiyun 10*4882a593Smuzhiyun* desktop icon is of no use 11*4882a593Smuzhiyun* desktop icon confuses when using showdesktop plugin 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunUpstream-Status: Pending 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSigned-off-by: Andreas Müller <schnitzeltony@googlemail.com> 16*4882a593Smuzhiyun--- 17*4882a593Smuzhiyun plugins/windowmenu/windowmenu.c | 10 +++++----- 18*4882a593Smuzhiyun 1 file changed, 5 insertions(+), 5 deletions(-) 19*4882a593Smuzhiyun 20*4882a593Smuzhiyundiff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c 21*4882a593Smuzhiyunindex f47e993e..061d6544 100644 22*4882a593Smuzhiyun--- a/plugins/windowmenu/windowmenu.c 23*4882a593Smuzhiyun+++ b/plugins/windowmenu/windowmenu.c 24*4882a593Smuzhiyun@@ -251,7 +251,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) 25*4882a593Smuzhiyun g_signal_connect (G_OBJECT (plugin->button), "toggled", 26*4882a593Smuzhiyun G_CALLBACK (window_menu_plugin_menu), plugin); 27*4882a593Smuzhiyun 28*4882a593Smuzhiyun- plugin->icon = gtk_image_new_from_icon_name ("user-desktop", GTK_ICON_SIZE_BUTTON); 29*4882a593Smuzhiyun+ plugin->icon = gtk_image_new_from_icon_name (NULL, GTK_ICON_SIZE_BUTTON); 30*4882a593Smuzhiyun gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon); 31*4882a593Smuzhiyun gtk_widget_show (plugin->icon); 32*4882a593Smuzhiyun } 33*4882a593Smuzhiyun@@ -640,7 +640,7 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, 34*4882a593Smuzhiyun /* skip 'fake' windows */ 35*4882a593Smuzhiyun type = wnck_window_get_window_type (window); 36*4882a593Smuzhiyun if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK) 37*4882a593Smuzhiyun- goto show_desktop_icon; 38*4882a593Smuzhiyun+ goto show_no_icon; 39*4882a593Smuzhiyun 40*4882a593Smuzhiyun /* get the window icon and set the tooltip */ 41*4882a593Smuzhiyun gtk_widget_set_tooltip_text (GTK_WIDGET (icon), 42*4882a593Smuzhiyun@@ -660,12 +660,12 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, 43*4882a593Smuzhiyun } 44*4882a593Smuzhiyun else 45*4882a593Smuzhiyun { 46*4882a593Smuzhiyun- show_desktop_icon: 47*4882a593Smuzhiyun+ show_no_icon: 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun /* desktop is shown right now */ 50*4882a593Smuzhiyun- gtk_image_set_from_icon_name (GTK_IMAGE (icon), "user-desktop", icon_size); 51*4882a593Smuzhiyun+ gtk_image_set_from_icon_name (GTK_IMAGE (icon), NULL, icon_size); 52*4882a593Smuzhiyun gtk_image_set_pixel_size (GTK_IMAGE (icon), icon_size); 53*4882a593Smuzhiyun- gtk_widget_set_tooltip_text (GTK_WIDGET (icon), _("Desktop")); 54*4882a593Smuzhiyun+ gtk_widget_set_tooltip_text (GTK_WIDGET (icon), _("No Windows")); 55*4882a593Smuzhiyun } 56*4882a593Smuzhiyun } 57*4882a593Smuzhiyun } 58*4882a593Smuzhiyun-- 59*4882a593Smuzhiyun2.14.3 60*4882a593Smuzhiyun 61