[next] telepathy-gabble: Replace dbus_g_method_return with g_dbus_method_invocation_return_value

[Simon McVittie]

Module: telepathy-gabble
Branch: next
Commit: 977aa041b3a64b94799781483c45e5cd94ea2a82
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=977aa041b3a64b94799781483c45e5cd94ea2a82

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Mar 18 18:58:21 2014 +0000

Replace dbus_g_method_return with g_dbus_method_invocation_return_value

---

 src/conn-location.c       |    2 +-
 src/muc-channel.c         |    3 ++-
 src/server-sasl-channel.c |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/conn-location.c b/src/conn-location.c
index 9aa3e66..25ee4fe 100644
--- a/src/conn-location.c
+++ b/src/conn-location.c
@@ -286,7 +286,7 @@ set_location_sent_cb (GabbleConnection *conn,
 
   if (!wocky_stanza_extract_errors (reply_msg, NULL, &error, NULL, NULL))
     {
-      dbus_g_method_return (context);
+      g_dbus_method_invocation_return_value (context, NULL);
     }
   else
     {
diff --git a/src/muc-channel.c b/src/muc-channel.c
index b7c0d55..ab2f66c 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -1452,7 +1452,8 @@ provide_password_return_if_pending (GabbleMucChannel *chan, gboolean success)
 
   if (priv->password_ctx)
     {
-      dbus_g_method_return (priv->password_ctx, success);
+      g_dbus_method_invocation_return_value (priv->password_ctx,
+          g_variant_new ("(b)", success));
       priv->password_ctx = NULL;
     }
 
diff --git a/src/server-sasl-channel.c b/src/server-sasl-channel.c
index 09040a7..073896c 100644
--- a/src/server-sasl-channel.c
+++ b/src/server-sasl-channel.c
@@ -556,7 +556,7 @@ gabble_server_sasl_channel_start_mechanism_with_data (
         }
 
       change_current_state (self, TP_SASL_STATUS_IN_PROGRESS);
-      dbus_g_method_return (context);
+      g_dbus_method_invocation_return_value (context, NULL);
 
       start_data =
         wocky_auth_registry_start_data_new (in_Mechanism, initial_data);