summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@nokia.com>2011-02-03 20:10:59 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2011-02-09 13:33:51 (GMT)
commited919d0be2e2f1c9df801e5c6649eed65595769e (patch)
tree89574ab9979e679c3d7639c2c43077463eb72674
parent24c06f644ce04610ad010412b64bc1dc7443c639 (diff)
downloadQt-ed919d0be2e2f1c9df801e5c6649eed65595769e.zip
Qt-ed919d0be2e2f1c9df801e5c6649eed65595769e.tar.gz
Qt-ed919d0be2e2f1c9df801e5c6649eed65595769e.tar.bz2
Use the thread-default glib context for the DBus connection in the ICD bearer manager.
This allows the bearer management plugin to be ran on a thread different than the main one. Task-number: QTBUG-17199 Reviewed-by: Kranthi <kranthi.kumar-kuntala@nokia.com>
-rw-r--r--src/plugins/bearer/icd/dbusdispatcher.cpp2
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,