diff options
Diffstat (limited to 'meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch')
-rw-r--r-- | meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch index 1adb14552d..154f72d186 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch +++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch @@ -13,15 +13,19 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Pending Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + +Rebase for xfce4-panel 4.18.3. + +Signed-off-by: Kai Kang <kai.kang@windriver.com> --- plugins/windowmenu/windowmenu.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c -index f47e993e..061d6544 100644 +index be7dea4..2f432b0 100644 --- a/plugins/windowmenu/windowmenu.c +++ b/plugins/windowmenu/windowmenu.c -@@ -251,7 +251,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) +@@ -262,7 +262,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) g_signal_connect (G_OBJECT (plugin->button), "toggled", G_CALLBACK (window_menu_plugin_menu), plugin); @@ -29,17 +33,15 @@ index f47e993e..061d6544 100644 + plugin->icon = gtk_image_new_from_icon_name (NULL, GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon); gtk_widget_show (plugin->icon); - } -@@ -640,7 +640,7 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, + +@@ -695,19 +695,19 @@ 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), -@@ -660,12 +660,12 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, + window_menu_plugin_set_icon (plugin, window); } else { @@ -47,6 +49,7 @@ index f47e993e..061d6544 100644 + show_no_icon: /* desktop is shown right now */ + icon_size = xfce_panel_plugin_get_icon_size (XFCE_PANEL_PLUGIN (plugin)); - gtk_image_set_from_icon_name (GTK_IMAGE (icon), "user-desktop", icon_size); + gtk_image_set_from_icon_name (GTK_IMAGE (icon), NULL, icon_size); gtk_image_set_pixel_size (GTK_IMAGE (icon), icon_size); |