summaryrefslogtreecommitdiffstats
path: root/meta-xfce/recipes-xfce/xfce4-panel/files/0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch
diff options
context:
space:
mode:
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.patch10
1 files changed, 5 insertions, 5 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 10c456f45e..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
@@ -14,7 +14,7 @@ Upstream-Status: Pending
14 14
15Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 15Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
16 16
17Rebase for xfce4 4.18.0. 17Rebase for xfce4-panel 4.18.3.
18 18
19Signed-off-by: Kai Kang <kai.kang@windriver.com> 19Signed-off-by: Kai Kang <kai.kang@windriver.com>
20--- 20---
@@ -22,10 +22,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
22 1 file changed, 5 insertions(+), 5 deletions(-) 22 1 file changed, 5 insertions(+), 5 deletions(-)
23 23
24diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c 24diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
25index ba245a3..f8fdee8 100644 25index be7dea4..2f432b0 100644
26--- a/plugins/windowmenu/windowmenu.c 26--- a/plugins/windowmenu/windowmenu.c
27+++ b/plugins/windowmenu/windowmenu.c 27+++ b/plugins/windowmenu/windowmenu.c
28@@ -250,7 +250,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin) 28@@ -262,7 +262,7 @@ window_menu_plugin_init (WindowMenuPlugin *plugin)
29 g_signal_connect (G_OBJECT (plugin->button), "toggled", 29 g_signal_connect (G_OBJECT (plugin->button), "toggled",
30 G_CALLBACK (window_menu_plugin_menu), plugin); 30 G_CALLBACK (window_menu_plugin_menu), plugin);
31 31
@@ -33,8 +33,8 @@ index ba245a3..f8fdee8 100644
33+ plugin->icon = gtk_image_new_from_icon_name (NULL, GTK_ICON_SIZE_BUTTON); 33+ plugin->icon = gtk_image_new_from_icon_name (NULL, GTK_ICON_SIZE_BUTTON);
34 gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon); 34 gtk_container_add (GTK_CONTAINER (plugin->button), plugin->icon);
35 gtk_widget_show (plugin->icon); 35 gtk_widget_show (plugin->icon);
36 } 36
37@@ -680,19 +680,19 @@ window_menu_plugin_active_window_changed (WnckScreen *screen, 37@@ -695,19 +695,19 @@ window_menu_plugin_active_window_changed (WnckScreen *screen,
38 /* skip 'fake' windows */ 38 /* skip 'fake' windows */
39 type = wnck_window_get_window_type (window); 39 type = wnck_window_get_window_type (window);
40 if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK) 40 if (type == WNCK_WINDOW_DESKTOP || type == WNCK_WINDOW_DOCK)