summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-03-21 21:43:17 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-25 10:29:15 +0000
commitc8430227f480c18dcfb93eb978f067a4edc4f0fb (patch)
treeb452e0c786500632eeab0c4eb6d1644f34d9b94a /meta/recipes-sato
parent01f68184ca5246550a5d819c022aa75270d31419 (diff)
downloadpoky-c8430227f480c18dcfb93eb978f067a4edc4f0fb.tar.gz
matchbox-panel-2: Fix Home-button icon load issue
Home (showdesktop) button sometimes did not load the icon because the active state was never initialized. Backport fix for this issue. [YOCTO #9026] (From OE-Core rev: 556da4760e2bf4afa1c825b927b62314174632eb) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/matchbox-panel-2/files/0001-showdesktop-Make-sure-active-state-is-initialized.patch50
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb1
2 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-sato/matchbox-panel-2/files/0001-showdesktop-Make-sure-active-state-is-initialized.patch b/meta/recipes-sato/matchbox-panel-2/files/0001-showdesktop-Make-sure-active-state-is-initialized.patch
new file mode 100644
index 0000000000..3bab6d292d
--- /dev/null
+++ b/meta/recipes-sato/matchbox-panel-2/files/0001-showdesktop-Make-sure-active-state-is-initialized.patch
@@ -0,0 +1,50 @@
1From a0b5fca04da208990f3c40e65dbb045da4cdb35e Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Sun, 20 Mar 2016 13:24:37 +0200
4Subject: [PATCH] showdesktop: Make sure active state is initialized
5
6There are cases (in qemu at least) where set_active()
7is never called on startup. Make sure we initialize the active
8state so the icon gets loaded and the applet is not confused
9about the current state.
10
11Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
12Signed-off-by: Ross Burton <ross.burton@intel.com>
13
14
15Upstream-Status: Backport
16---
17 applets/showdesktop/showdesktop.c | 10 ++++++++++
18 1 file changed, 10 insertions(+)
19
20diff --git a/applets/showdesktop/showdesktop.c b/applets/showdesktop/showdesktop.c
21index 61dd5c2..33c13e1 100644
22--- a/applets/showdesktop/showdesktop.c
23+++ b/applets/showdesktop/showdesktop.c
24@@ -181,6 +181,12 @@ button_clicked_cb (GtkButton *button,
25 &xev);
26 }
27
28+static void
29+realize_cb (GtkWidget *button, ShowDesktopApplet *applet)
30+{
31+ sync_applet (applet);
32+}
33+
34 G_MODULE_EXPORT GtkWidget *
35 mb_panel_applet_create (const char *id,
36 GtkOrientation orientation)
37@@ -216,6 +222,10 @@ mb_panel_applet_create (const char *id,
38 "clicked",
39 G_CALLBACK (button_clicked_cb),
40 applet);
41+ g_signal_connect (button,
42+ "realize",
43+ G_CALLBACK (realize_cb),
44+ applet);
45
46 g_object_weak_ref (G_OBJECT (button),
47 (GWeakNotify) show_desktop_applet_free,
48--
492.7.0
50
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
index 61d9e300ee..98c3ae487b 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
@@ -22,6 +22,7 @@ RREPLACES_${PN} = "matchbox-panel"
22RCONFLICTS_${PN} = "matchbox-panel" 22RCONFLICTS_${PN} = "matchbox-panel"
23 23
24SRC_URI = "git://git.yoctoproject.org/${BPN} \ 24SRC_URI = "git://git.yoctoproject.org/${BPN} \
25 file://0001-showdesktop-Make-sure-active-state-is-initialized.patch \
25 file://silence-warnings.patch" 26 file://silence-warnings.patch"
26 27
27EXTRA_OECONF = "--enable-startup-notification --enable-dbus" 28EXTRA_OECONF = "--enable-startup-notification --enable-dbus"