[kdbus] Fix problem with receiving async messages
authorLukasz Skalski <l.skalski@samsung.com>
Thu, 23 Apr 2015 13:32:23 +0000 (13:32 +0000)
committerMaciej Wereski <m.wereski@partner.samsung.com>
Fri, 10 Jul 2015 09:47:45 +0000 (11:47 +0200)
gio/gdbusconnection.c

index ca09ae3..4b3f839 100644 (file)
@@ -2712,7 +2712,12 @@ g_dbus_connection_send_message_with_reply_sync (GDBusConnection        *connecti
   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
 
   data = g_new0 (SendMessageSyncData, 1);
-  data->context = g_main_context_new ();
+
+  if (connection->kdbus_worker)
+    data->context = g_main_context_ref_thread_default ();
+  else
+     data->context = g_main_context_new ();
+
   data->loop = g_main_loop_new (data->context, FALSE);
 
   g_main_context_push_thread_default (data->context);