author | zecke <zecke> | 2004-11-03 23:04:36 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-11-03 23:04:36 (UTC) |
commit | cd2d50799e087fad5b56df9d7fe9aa572a313e64 (patch) (unidiff) | |
tree | 561df7f2fc260c9b4d3c8d9055698201e47939d3 /libopie2/opiecore/device/odevice.cpp | |
parent | a6adcd3869b9c9c7548290ea686bc4e78ed62fc3 (diff) | |
download | opie-cd2d50799e087fad5b56df9d7fe9aa572a313e64.zip opie-cd2d50799e087fad5b56df9d7fe9aa572a313e64.tar.gz opie-cd2d50799e087fad5b56df9d7fe9aa572a313e64.tar.bz2 |
-SIMpad crashes on QObject::connect() of the QCopChannel
-Luckily (I'm a cheater) OApplication can emit the signal for us
-Event more lucky, qpe and every quicklaunchable application
has a OApplication instance... so the signal is almost available
everywhere
-do not call initButtons from reloadButtonMappings if d->m_buttons
exists
Diffstat (limited to 'libopie2/opiecore/device/odevice.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index 67cae1c..e57cdef 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -645,9 +645,9 @@ const ODeviceButton *ODevice::buttonForKeycode ( ushort code ) | |||
645 | void ODevice::reloadButtonMapping() | 645 | void ODevice::reloadButtonMapping() |
646 | { | 646 | { |
647 | if(!d->m_buttons) | ||
647 | initButtons(); | 648 | initButtons(); |
648 | 649 | ||
649 | if(!d->m_initializedButtonQcop) { | 650 | if(!d->m_initializedButtonQcop) { |
650 | QCopChannel *chan = new QCopChannel("QPE/System", this, "ODevice button channel"); | 651 | connect(qApp,SIGNAL(systemMessageSignal(const QCString&,const QByteArray&)), |
651 | connect(chan,SIGNAL(received(const QCString&,const QByteArray&)), | ||
652 | this,SLOT(systemMessage(const QCString&,const QByteArray&))); | 652 | this,SLOT(systemMessage(const QCString&,const QByteArray&))); |
653 | d->m_initializedButtonQcop = true; | 653 | d->m_initializedButtonQcop = true; |