diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-07-04 17:42:49 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-04 17:42:49 +0000 |
| commit | 3fbcf379bbd88204d7dd396415bbb65346feeaab (patch) | |
| tree | 9a74ccf298a095cc74eb6bcc2cb878f98c5b548d /packages/opie-button-settings | |
| parent | 7fd16b8fe80ee1707595b3a6026e9026a0717502 (diff) | |
| parent | 86d9211f52171f3367ce974b997e16864e20118d (diff) | |
merge of 8f7f4f1a6f08da91c5fe2312650063893394888b
and f69ed55f40216d16d8f1cb7559d13b46385991b2
Diffstat (limited to 'packages/opie-button-settings')
| -rw-r--r-- | packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch | 25 | ||||
| -rw-r--r-- | packages/opie-button-settings/opie-button-settings.inc | 2 | ||||
| -rw-r--r-- | packages/opie-button-settings/opie-button-settings_1.2.2.bb (renamed from packages/opie-button-settings/opie-button-settings_1.2.1.bb) | 4 |
4 files changed, 2 insertions, 29 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 deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-button-settings/opie-button-settings-1.2.1/.mtn2git_empty +++ /dev/null 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 deleted file mode 100644 index 91a22bc976..0000000000 --- a/packages/opie-button-settings/opie-button-settings-1.2.1/1624-bugfix.patch +++ /dev/null @@ -1,25 +0,0 @@ -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.inc b/packages/opie-button-settings/opie-button-settings.inc index ec935e7112..733b7d9a5d 100644 --- a/packages/opie-button-settings/opie-button-settings.inc +++ b/packages/opie-button-settings/opie-button-settings.inc @@ -1,4 +1,4 @@ -DESCRIPTION = "Device-buttons settings dialog" +DESCRIPTION = "Opie device buttons settings dialog" SECTION = "opie/settings" PRIORITY = "optional" MAINTAINER = "Team Opie <opie@handhelds.org>" diff --git a/packages/opie-button-settings/opie-button-settings_1.2.1.bb b/packages/opie-button-settings/opie-button-settings_1.2.2.bb index 1f671597ba..576eba1dba 100644 --- a/packages/opie-button-settings/opie-button-settings_1.2.1.bb +++ b/packages/opie-button-settings/opie-button-settings_1.2.2.bb @@ -1,8 +1,6 @@ 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 \ - file://1624-bugfix.patch;patch=1" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" |