summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato/matchbox-keyboard
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-12-22 12:53:50 (GMT)
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-23 14:28:21 (GMT)
commit4efbda84392e00829b9619ba4d8c49bdc5128606 (patch)
treecbd2493ba741feb4843bdb54b519eb3bd54889f7 /meta/recipes-sato/matchbox-keyboard
parent9bf19c0e1b94c6a9fe4d3965f25267b5d26cc8ce (diff)
downloadpoky-4efbda84392e00829b9619ba4d8c49bdc5128606.tar.gz
matchbox-keyboard: Make as singleton
Multiple matchbox-keyboard instances would occupy whole screen and cause X window segfault. Making matchbox-keyboard singleton is one work around. This patch allow only one instance of matchbox-keyboard based on some mechanism in matchbox-desktop. In future, an applet and GTK-IM modules in matchbox-keyboard can be used to automatically map/unmap the virtual keyboard on demand. [BUGID #509] got fixed. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-sato/matchbox-keyboard')
-rw-r--r--meta/recipes-sato/matchbox-keyboard/files/single-instance.patch22
-rw-r--r--meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb1
2 files changed, 23 insertions, 0 deletions
diff --git a/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch b/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch
new file mode 100644
index 0000000..d0adc47
--- /dev/null
+++ b/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch
@@ -0,0 +1,22 @@
1Multiple matchbox-keyboard instances would occupy whole screen and cause X
2window segfault(Bug 509). Making matchbox-keyboard singleton is one work
3around.
4
5This patch allow only one instance of matchbox-keyboard based on some mechanism
6in matchbox-desktop. In future, an applet and GTK-IM modules in
7matchbox-keyboard can be used to automatically map/unmap the virtual keyboard
8on demand.
9
10Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
11
12
13Index: matchbox-keyboard/matchbox-keyboard.desktop
14===================================================================
15--- matchbox-keyboard.orig/matchbox-keyboard.desktop 2010-12-22 20:41:40.000000000 +0800
16+++ matchbox-keyboard/matchbox-keyboard.desktop 2010-12-22 20:42:12.000000000 +0800
17@@ -6,3 +6,5 @@
18 Icon=matchbox-keyboard.png
19 Categories=Panel;Utility;MB
20 X-MB-INPUT-MECHANSIM=True
21+X-MB-SingleInstance=true
22+StartupNotify=true
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb
index 0425fec..337738e 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -15,6 +15,7 @@ PR = "r4"
15 15
16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 16SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
17 file://configure_fix.patch;patch=1;maxrev=1819 \ 17 file://configure_fix.patch;patch=1;maxrev=1819 \
18 file://single-instance.patch;patch=1 \
18 file://80matchboxkeyboard.shbg" 19 file://80matchboxkeyboard.shbg"
19 20
20S = "${WORKDIR}/${PN}" 21S = "${WORKDIR}/${PN}"