summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2005-10-18 11:29:44 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-10-18 11:29:44 +0000
commit5438d29745e507e88acf66d4e1aca01c8fd67539 (patch)
tree12795fef33c1f1a2decfb2dca3e6ffcb3909c1c0
parentb35c41080f29c20e0b36c916c5acc607aa6b66d8 (diff)
opie-button-settings 1.2.1: CVS backported patch for OPIE bug #1624
- Button settngs changes are applied only after restart
-rw-r--r--packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty0
-rw-r--r--packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch25
-rw-r--r--packages/opie-button-settings/opie-button-settings_1.2.1.bb7
3 files changed, 29 insertions, 3 deletions
diff --git a/packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty b/packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty
diff --git a/packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch b/packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch
new file mode 100644
index 0000000000..91a22bc976
--- /dev/null
+++ b/packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch
@@ -0,0 +1,25 @@
+Index: button/buttonsettings.cpp
+===================================================================
+RCS file: /cvs/opie/core/settings/button/buttonsettings.cpp,v
+retrieving revision 1.13
+retrieving revision 1.14
+diff -u -u -r1.13 -r1.14
+--- button/buttonsettings.cpp 24 Apr 2005 20:24:00 -0000 1.13
++++ button/buttonsettings.cpp 12 Oct 2005 21:08:35 -0000 1.14
+@@ -37,7 +37,7 @@
+ #include <qlabel.h>
+ #include <qtimer.h>
+ #include <qscrollview.h>
+-
++#include <qcopchannel_qws.h>
+
+ using namespace Opie::Core;
+
+@@ -157,6 +157,7 @@
+ ButtonSettings::~ButtonSettings ( )
+ {
+ QPEApplication::ungrabKeyboard ( );
++ QCopChannel::send ("QPE/System", "deviceButtonMappingChanged()" );
+ }
+
+ void ButtonSettings::updateLabels ( )
diff --git a/packages/opie-button-settings/opie-button-settings_1.2.1.bb b/packages/opie-button-settings/opie-button-settings_1.2.1.bb
index 6f1e29f4d5..1f671597ba 100644
--- a/packages/opie-button-settings/opie-button-settings_1.2.1.bb
+++ b/packages/opie-button-settings/opie-button-settings_1.2.1.bb
@@ -1,7 +1,8 @@
include ${PN}.inc
-
-
+
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/settings/button \
${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
- ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+ ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+ file://1624-bugfix.patch;patch=1"