[Hello Message] autoreply finished using worker function

diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index 5a1f21f..ee55ff4 100644 (file)
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
@@ -508,7 +508,7 @@ _g_dbus_worker_emit_message_about_to_be_sent (GDBusWorker  *worker,
 }
 
 /* can only be called from private thread with read-lock held - takes ownership of @message */
-static void
+void
 _g_dbus_worker_queue_or_deliver_received_message (GDBusWorker  *worker,
                                                   GDBusMessage *message)
 {
@@ -995,7 +995,7 @@ write_message_continue_writing (MessageToWriteData *data)
     {
       GError *error;
       error = NULL;
-      data->total_written = g_kdbus_send_message(data->worker->kdbus, data->message, data->blob, data->blob_size, &error);
+      data->total_written = g_kdbus_send_message(data->worker, data->worker->kdbus, data->message, data->blob, data->blob_size, &error);
       
       if (data->total_written == data->blob_size)
         {

diff --git a/gio/gdbusprivate.h b/gio/gdbusprivate.h
index 3a62867..5e6217b 100644 (file)
--- a/gio/gdbusprivate.h
+++ b/gio/gdbusprivate.h
@@ -80,7 +80,9 @@ gboolean     _g_dbus_worker_flush_sync   (GDBusWorker    *worker,
 void         _g_dbus_worker_close        (GDBusWorker         *worker,
                                           GCancellable        *cancellable,
                                           GSimpleAsyncResult  *result);
-
+/* Samsung change */
+void _g_dbus_worker_queue_or_deliver_received_message (GDBusWorker  *worker,
+                                                       GDBusMessage *message);
 /* ---------------------------------------------------------------------------------------------------- */
 
 void _g_dbus_initialize (void);

diff --git a/gio/gkdbus.c b/gio/gkdbus.c
index 527285f..2d3a89e 100644 (file)
--- a/gio/gkdbus.c
+++ b/gio/gkdbus.c
@@ -409,7 +409,9 @@ g_kdbus_receive (GKdbus       *kdbus,
 }
 
 static gboolean
-g_kdbus_send_reply(GKdbus *kdbus, GDBusMessage    *dbus_msg)
+g_kdbus_send_reply(GDBusWorker     *worker, 
+                   GKdbus           *kdbus, 
+                   GDBusMessage    *dbus_msg)
 {
   GDBusMessage    *reply = NULL;
   char            *unique_name = NULL;
@@ -422,7 +424,7 @@ g_kdbus_send_reply(GKdbus *kdbus, GDBusMessage    *dbus_msg)
 
   g_dbus_message_set_body(reply, g_variant_new ("(s)", unique_name));
   
-  //_g_dbus_worker_queue_or_deliver_received_message (worker, message);
+  _g_dbus_worker_queue_or_deliver_received_message (worker, reply);
 }
 
 
@@ -432,7 +434,8 @@ g_kdbus_send_reply(GKdbus *kdbus, GDBusMessage    *dbus_msg)
  * @kdbus: a #GKdbus
  */
 gssize
-g_kdbus_send_message (GKdbus          *kdbus,
+g_kdbus_send_message (GDBusWorker     *worker,
+                      GKdbus          *kdbus,
                       GDBusMessage    *dbus_msg,
                       gchar           *blob,
                       gsize           blob_size,
@@ -458,7 +461,7 @@ g_kdbus_send_message (GKdbus          *kdbus,
       return -1;
     }
 
-    g_kdbus_send_reply(kdbus, dbus_msg);
+    g_kdbus_send_reply(worker, kdbus, dbus_msg);
     
     
     

diff --git a/gio/gkdbus.h b/gio/gkdbus.h
index 7888797..f60b09e 100644 (file)
--- a/gio/gkdbus.h
+++ b/gio/gkdbus.h
@@ -29,6 +29,7 @@
 #endif
 
 #include <gio/giotypes.h>
+#include "gdbusprivate.h"
 
 G_BEGIN_DECLS
 
@@ -91,7 +92,8 @@ gssize                  g_kdbus_receive                 (GKdbus       *kdbus,
                                                          void         *data,
                                                                     GError       **error);
 GLIB_AVAILABLE_IN_ALL
-gssize                  g_kdbus_send_message            (GKdbus          *kdbus,
+gssize                  g_kdbus_send_message            (GDBusWorker     *worker,
+                                                         GKdbus          *kdbus,
                                                          GDBusMessage    *dbus_msg,
                                                          gchar           *blob,
                                                          gsize            blob_size,