diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch')
-rw-r--r-- | meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch deleted file mode 100644 index b2d960c00..000000000 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/files/0002-windowmenu-do-not-display-desktop-icon-when-no-windo.patch +++ /dev/null @@ -1,60 +0,0 @@ -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 - |