From 5438d29745e507e88acf66d4e1aca01c8fd67539 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 18 Oct 2005 11:29:44 +0000
Subject: opie-button-settings 1.2.1: CVS backported patch for OPIE bug #1624 -
 Button settngs changes are applied only after restart

---
 .../opie-button-settings-1.2.1/.mtn2git_empty      |  0
 .../opie-button-settings-1.2.1/1624-bugfix.patch   | 25 ++++++++++++++++++++++
 .../opie-button-settings_1.2.1.bb                  |  7 +++---
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty
 create mode 100644 packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch

(limited to 'packages/opie-button-settings')

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
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"
-- 
cgit 1.2.3-korg