diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-10 02:23:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-10 02:23:31 (GMT) |
| commit | fd3b8a0e008dd00e363ac173a2cfcabcab31c454 (patch) | |
| tree | fa0f4db8b95e698e63d0d05e4a0d6eaee85b0f72 /src/plugins | |
| parent | 65b1a5c2cb6c3ebb4ca95119eab9b2ec392333e8 (diff) | |
| parent | ed919d0be2e2f1c9df801e5c6649eed65595769e (diff) | |
| download | Qt-fd3b8a0e008dd00e363ac173a2cfcabcab31c454.zip Qt-fd3b8a0e008dd00e363ac173a2cfcabcab31c454.tar.gz Qt-fd3b8a0e008dd00e363ac173a2cfcabcab31c454.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Use the thread-default glib context for the DBus connection in the ICD bearer manager.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/icd/dbusdispatcher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/bearer/icd/dbusdispatcher.cpp b/src/plugins/bearer/icd/dbusdispatcher.cpp index 5fc2a38..f100a48 100644 --- a/src/plugins/bearer/icd/dbusdispatcher.cpp +++ b/src/plugins/bearer/icd/dbusdispatcher.cpp @@ -468,7 +468,7 @@ void DBusDispatcher::setupDBus() d_ptr->signal_vtable.message_function = signalHandler; dbus_connection_set_exit_on_disconnect(d_ptr->connection, FALSE); - dbus_connection_setup_with_g_main(d_ptr->connection, NULL); + dbus_connection_setup_with_g_main(d_ptr->connection, g_main_context_get_thread_default()); dbus_connection_register_object_path(d_ptr->connection, d_ptr->signalPath.toLatin1(), &d_ptr->signal_vtable, |