From 52f69a95852fd1e8d101f666c2c88762b6d05334 Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 24 Mar 2014 18:37:15 +0000
Subject: Replace dbus_g_method_return_error with
 g_dbus_method_invocation_return_gerror

Excluding tools/.

Automated:
  git grep -lz dbus_g_method_return_error |
  xargs -0 perl -pi -e 's/\bdbus_g_method_return_error\b/g_dbus_method_invocation_return_gerror/g'
---
 src/connection-aliasing.c | 6 +++---
 src/connection-avatars.c  | 6 +++---
 src/connection-mail.c     | 4 ++--
 src/im-channel.c          | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/connection-aliasing.c b/src/connection-aliasing.c
index f46467e..e350cc2 100644
--- a/src/connection-aliasing.c
+++ b/src/connection-aliasing.c
@@ -146,7 +146,7 @@ haze_connection_request_aliases (TpSvcConnectionInterfaceAliasing1 *self,
 
     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;
     }
@@ -280,7 +280,7 @@ haze_connection_set_aliases (TpSvcConnectionInterfaceAliasing1 *self,
     {
         g_set_error (&error, TP_ERROR, TP_ERROR_NOT_AVAILABLE,
             "You can't set aliases on this protocol");
-        dbus_g_method_return_error (context, error);
+        g_dbus_method_invocation_return_gerror (context, error);
         g_error_free (error);
         return;
     }
@@ -289,7 +289,7 @@ haze_connection_set_aliases (TpSvcConnectionInterfaceAliasing1 *self,
 
     if (error)
     {
-        dbus_g_method_return_error (context, error);
+        g_dbus_method_invocation_return_gerror (context, error);
         g_error_free (error);
     }
     else
diff --git a/src/connection-avatars.c b/src/connection-avatars.c
index 291f684..53e15d9 100644
--- a/src/connection-avatars.c
+++ b/src/connection-avatars.c
@@ -298,7 +298,7 @@ haze_connection_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatars1 *self,
 
     if (!tp_handles_are_valid (contact_repo, contacts, FALSE, &err))
     {
-        dbus_g_method_return_error (context, err);
+        g_dbus_method_invocation_return_gerror (context, err);
         g_error_free (err);
         return;
     }
@@ -417,7 +417,7 @@ haze_connection_set_avatar (TpSvcConnectionInterfaceAvatars1 *self,
                      "but the limit is %" G_GSIZE_FORMAT "B",
                      icon_len, max_filesize);
 
-        dbus_g_method_return_error (context, error);
+        g_dbus_method_invocation_return_gerror (context, error);
 
         g_error_free (error);
         return;
@@ -444,7 +444,7 @@ haze_connection_set_avatar (TpSvcConnectionInterfaceAvatars1 *self,
         g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
             "'%s' is not a supported MIME type", mime_type);
 
-        dbus_g_method_return_error (context, error);
+        g_dbus_method_invocation_return_gerror (context, error);
 
         g_error_free (error);
 
diff --git a/src/connection-mail.c b/src/connection-mail.c
index 716f684..c2666f1 100644
--- a/src/connection-mail.c
+++ b/src/connection-mail.c
@@ -48,7 +48,7 @@ haze_connection_mail_request_inbox_url (
 {
     GError e = {TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
         "LibPurple does not provide Inbox URL"};
-    dbus_g_method_return_error (context, &e);
+    g_dbus_method_invocation_return_gerror (context, &e);
 }
 
 
@@ -65,7 +65,7 @@ haze_connection_mail_request_mail_url (
         {
              GError e = {TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
                  "Wrong type for url-data"};
-             dbus_g_method_return_error (context, &e);
+             g_dbus_method_invocation_return_gerror (context, &e);
              return;
         }
 
diff --git a/src/im-channel.c b/src/im-channel.c
index d4d14c2..da65934 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -221,7 +221,7 @@ haze_im_channel_set_chat_state (TpSvcChannelInterfaceChatState1 *self,
 
     if (error)
     {
-          dbus_g_method_return_error (context, error);
+          g_dbus_method_invocation_return_gerror (context, error);
           g_error_free (error);
           return;
     }
-- 
cgit v1.2.1