diff options
| author | Martin Wolf <ext-martin.2.wolf@nokia.com> | 2010-04-27 12:35:08 +0300 |
|---|---|---|
| committer | Martin Wolf <ext-martin.2.wolf@nokia.com> | 2010-04-27 12:35:08 +0300 |
| commit | 0e279e4350932643144f4ba9ac0afe501cb94c47 (patch) | |
| tree | 0fff1fd6e8e80c66cea9144085dba32601ad028e | |
| parent | cc2338087c34f699c6e7315cac5dfdedf21128b1 (diff) | |
| download | libresourceqt-0e279e4350932643144f4ba9ac0afe501cb94c47.tar.gz | |
Bug fix #165710 and #165755
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | libdbus-qeventloop/dbusconnectioneventloop.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 33a80d7..96a1009 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,10 @@ libresourceqt (1.6) unstable; urgency=low * Implemented SWP#Plicy-296 + [Martin Wolf] + * Fixes: NB#165755 - DBUSConnectionEventLoop crashes when dbus p2p connection closes. + * Fixes: NB#165710 - DBUSConnectionEventLoop causes that QTimers stops working + -- Wolf Bergenheim <ext-wolf.2.bergenheim@nokia.com> Wed, 21 Apr 2010 14:38:49 +0300 libresourceqt (1.5) unstable; urgency=low diff --git a/libdbus-qeventloop/dbusconnectioneventloop.cpp b/libdbus-qeventloop/dbusconnectioneventloop.cpp index e759d36..48152d9 100644 --- a/libdbus-qeventloop/dbusconnectioneventloop.cpp +++ b/libdbus-qeventloop/dbusconnectioneventloop.cpp @@ -53,9 +53,7 @@ void DBUSConnectionEventLoop::readSocket(int fd) const Watcher &watcher = it.value(); if (watcher.read && watcher.read->isEnabled()) { - watcher.read->setEnabled(false); dbus_watch_handle(watcher.watch, DBUS_WATCH_READABLE); - watcher.read->setEnabled(true); break; } @@ -76,9 +74,7 @@ void DBUSConnectionEventLoop::writeSocket(int fd) const Watcher &watcher = it.value(); if (watcher.write && watcher.write->isEnabled()) { - watcher.write->setEnabled(false); dbus_watch_handle(watcher.watch, DBUS_WATCH_WRITABLE); - watcher.write->setEnabled(true); break; } |