Added GKdbus to GDBusWorker struct
authorLukasz Skalski <l.skalski@partner.samsung.com>
Wed, 25 Sep 2013 16:34:11 +0000 (18:34 +0200)
committerLukasz Skalski <l.skalski@partner.samsung.com>
Fri, 25 Oct 2013 14:03:51 +0000 (16:03 +0200)
gio/gdbusprivate.c

index 0e5bef2..9c9d79e 100644 (file)
@@ -42,6 +42,7 @@
 #include "glib/gstdio.h"
 #include "gsocketcontrolmessage.h"
 #include "gsocketconnection.h"
+#include "gkdbusconnection.h"
 #include "gsocketoutputstream.h"
 
 #ifdef G_OS_UNIX
@@ -364,8 +365,9 @@ struct GDBusWorker
   GDBusWorkerDisconnectedCallback     disconnected_callback;
   gpointer                            user_data;
 
-  /* if not NULL, stream is GSocketConnection */
+  /* if GSocket and GKdbus are NULL, stream is GSocketConnection */
   GSocket *socket;
+  GKdbus  *kdbus;
 
   /* used for reading */
   GMutex                              read_lock;
@@ -1677,6 +1679,9 @@ _g_dbus_worker_new (GIOStream                              *stream,
   if (G_IS_SOCKET_CONNECTION (worker->stream))
     worker->socket = g_socket_connection_get_socket (G_SOCKET_CONNECTION (worker->stream));
 
+  if (G_IS_KDBUS_CONNECTION (worker->stream))
+    worker->kdbus = g_kdbus_connection_get_kdbus (G_KDBUS_CONNECTION (worker->stream));
+
   worker->shared_thread_data = _g_dbus_shared_thread_ref ();
 
   /* begin reading */