[next] telepathy-rakia: Replace dbus_g_method_return_error with g_dbus_method_invocation_return_gerror

Simon McVittie smcv at kemper.freedesktop.org
Thu Apr 3 07:33:35 PDT 2014


Module: telepathy-rakia
Branch: next
Commit: bad1a57c4facff9308230bcd62ed3ce42b14cc1f
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=bad1a57c4facff9308230bcd62ed3ce42b14cc1f

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Mar 24 18:43:38 2014 +0000

Replace dbus_g_method_return_error with g_dbus_method_invocation_return_gerror

---

 rakia/connection-aliasing.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rakia/connection-aliasing.c b/rakia/connection-aliasing.c
index 2c35f73..6d41970 100644
--- a/rakia/connection-aliasing.c
+++ b/rakia/connection-aliasing.c
@@ -160,7 +160,7 @@ rakia_connection_request_aliases (TpSvcConnectionInterfaceAliasing1 *iface,
 
   if (!tp_handles_are_valid (contact_handles, contacts, FALSE, &error))
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -250,7 +250,7 @@ rakia_connection_set_aliases (TpSvcConnectionInterfaceAliasing1 *iface,
       /* One of the handles (if there are any) cannot be the self handle */
       GError err = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Cannot set aliases for any contact except self" };
-      dbus_g_method_return_error (context, &err);
+      g_dbus_method_invocation_return_gerror (context, &err);
       return;
     }
 



More information about the telepathy-commits mailing list