diff options
| author | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-02-15 13:13:01 (GMT) |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-02-15 13:13:01 (GMT) |
| commit | 1c5596b514d3a590bd624c9e83606b435e5d4889 (patch) | |
| tree | e2e672c4822fe26bea8b7e4a1424931da23a7639 /src/plugins/bearer/icd/dbusdispatcher.cpp | |
| parent | 9c8b54fab60835f24cd15b806a7919df804c4615 (diff) | |
| parent | 7033466baf4f78fd580d5dd54a0a4a2e42d71603 (diff) | |
| download | Qt-1c5596b514d3a590bd624c9e83606b435e5d4889.zip Qt-1c5596b514d3a590bd624c9e83606b435e5d4889.tar.gz Qt-1c5596b514d3a590bd624c9e83606b435e5d4889.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7
Diffstat (limited to 'src/plugins/bearer/icd/dbusdispatcher.cpp')
| -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 5f9be74..13cd8a9 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, |