Use g_dbus_method_invocation_return_gerror

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'

17 files changed, 61 insertions, 61 deletions

diff --git a/plugins/console/channel.c b/plugins/console/channel.c
index 99cb907e5..6e03c032c 100644
--- a/plugins/console/channel.c
+++ b/plugins/console/channel.c
@@ -292,7 +292,7 @@ return_from_send_iq (
 
   if (g_simple_async_result_propagate_error (simple, &error))
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
     }
   else
@@ -444,7 +444,7 @@ console_send_iq (
   else
     {
       DEBUG ("%s", error->message);
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
     }
 }
@@ -465,7 +465,7 @@ console_stanza_sent_cb (
     }
   else
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_clear_error (&error);
     }
 }
@@ -519,7 +519,7 @@ console_send_stanza (
   else
     {
       DEBUG ("%s", error->message);
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
     }
 
diff --git a/plugins/gateways.c b/plugins/gateways.c
index 6df431c93..320702dc9 100644
--- a/plugins/gateways.c
+++ b/plugins/gateways.c
@@ -444,7 +444,7 @@ register_cb (GObject *source,
 
       DEBUG ("Failed to register with '%s': %s", pr->gateway,
           tp_error->message);
-      dbus_g_method_return_error (pr->context, tp_error);
+      g_dbus_method_invocation_return_gerror (pr->context, tp_error);
       pr->context = NULL;
       g_error_free (error);
       g_error_free (tp_error);
@@ -551,7 +551,7 @@ gateways_register (
 
 error:
   DEBUG ("%s", error->message);
-  dbus_g_method_return_error (context, error);
+  g_dbus_method_invocation_return_gerror (context, error);
   g_error_free (error);
 }
 
diff --git a/src/conn-aliasing.c b/src/conn-aliasing.c
index 88aeeb255..8b66b7174 100644
--- a/src/conn-aliasing.c
+++ b/src/conn-aliasing.c
@@ -374,7 +374,7 @@ gabble_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;
     }
@@ -592,7 +592,7 @@ gabble_connection_set_aliases (TpSvcConnectionInterfaceAliasing1 *iface,
     }
   else
     {
-      dbus_g_method_return_error (context, first_error);
+      g_dbus_method_invocation_return_gerror (context, first_error);
       g_error_free (first_error);
     }
 }
diff --git a/src/conn-avatars.c b/src/conn-avatars.c
index d22eef709..cdb957b6e 100644
--- a/src/conn-avatars.c
+++ b/src/conn-avatars.c
@@ -180,7 +180,7 @@ gabble_connection_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatars1 *ifa
 
   if (!tp_handles_are_valid (contact_handles, contacts, FALSE, &err))
     {
-      dbus_g_method_return_error (invocation, err);
+      g_dbus_method_invocation_return_gerror (invocation, err);
       g_error_free (err);
       return;
     }
@@ -384,7 +384,7 @@ gabble_connection_request_avatars (TpSvcConnectionInterfaceAvatars1 *iface,
 
   if (!tp_handles_are_valid (contacts_repo, contacts, FALSE, &error))
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -463,7 +463,7 @@ _set_avatar_cb2 (GabbleVCardManager *manager,
             vcard_error->code == WOCKY_XMPP_ERROR_NOT_ACCEPTABLE)
           tp_error.code = TP_ERROR_INVALID_ARGUMENT;
 
-      dbus_g_method_return_error (ctx->invocation, &tp_error);
+      g_dbus_method_invocation_return_gerror (ctx->invocation, &tp_error);
     }
   else
     {
@@ -491,7 +491,7 @@ _set_avatar_cb2 (GabbleVCardManager *manager,
         }
       else
         {
-          dbus_g_method_return_error (ctx->invocation, error);
+          g_dbus_method_invocation_return_gerror (ctx->invocation, error);
           g_error_free (error);
         }
     }
diff --git a/src/conn-client-types.c b/src/conn-client-types.c
index 9f3c056f6..e0c763a44 100644
--- a/src/conn-client-types.c
+++ b/src/conn-client-types.c
@@ -95,7 +95,7 @@ client_types_request_client_types (TpSvcConnectionInterfaceClientTypes1 *iface,
 
   if (!tp_handle_is_valid (contact_handles, contact, &error))
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
diff --git a/src/conn-contact-info.c b/src/conn-contact-info.c
index b29aac07d..e65a6345f 100644
--- a/src/conn-contact-info.c
+++ b/src/conn-contact-info.c
@@ -438,7 +438,7 @@ _return_from_request_contact_info (WockyNode *vcard_node,
           /* what other mappings make sense here? */
         }
 
-      dbus_g_method_return_error (context, &tp_error);
+      g_dbus_method_invocation_return_gerror (context, &tp_error);
       return;
     }
 
@@ -446,7 +446,7 @@ _return_from_request_contact_info (WockyNode *vcard_node,
 
   if (contact_info == NULL)
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -496,7 +496,7 @@ gabble_connection_refresh_contact_info (TpSvcConnectionInterfaceContactInfo1 *if
 
   if (!tp_handles_are_valid (contacts_repo, contacts, FALSE, &error))
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -550,7 +550,7 @@ gabble_connection_request_contact_info (TpSvcConnectionInterfaceContactInfo1 *if
 
   if (!tp_handle_is_valid (contact_handles, contact, &err))
     {
-      dbus_g_method_return_error (context, err);
+      g_dbus_method_invocation_return_gerror (context, err);
       g_error_free (err);
       return;
     }
@@ -646,7 +646,7 @@ _set_contact_info_cb (GabbleVCardManager *vcard_manager,
             vcard_error->code == WOCKY_XMPP_ERROR_NOT_ACCEPTABLE)
           tp_error.code = TP_ERROR_INVALID_ARGUMENT;
 
-      dbus_g_method_return_error (context, &tp_error);
+      g_dbus_method_invocation_return_gerror (context, &tp_error);
     }
   else
     {
@@ -845,7 +845,7 @@ finally:
       DEBUG ("%s", error->message);
       g_list_foreach (edits, (GFunc) gabble_vcard_manager_edit_info_free,
           NULL);
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
     }
   else
diff --git a/src/conn-location.c b/src/conn-location.c
index 2922e705c..9aa3e66a3 100644
--- a/src/conn-location.c
+++ b/src/conn-location.c
@@ -135,7 +135,7 @@ request_location_reply_cb (GObject *source,
     {
       DEBUG ("fetching location failed: %s", wocky_error->message);
       gabble_set_tp_error_from_wocky (wocky_error, &tp_error);
-      dbus_g_method_return_error (ctx->context, tp_error);
+      g_dbus_method_invocation_return_gerror (ctx->context, tp_error);
       g_error_free (tp_error);
     }
   else
@@ -185,7 +185,7 @@ location_request_location (
 
   if (!tp_handle_is_valid (contact_handles, handle, &error))
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -295,7 +295,7 @@ set_location_sent_cb (GabbleConnection *conn,
       DEBUG ("SetLocation failed: %s", error->message);
 
       gabble_set_tp_error_from_wocky (error, &tp_error);
-      dbus_g_method_return_error (context, tp_error);
+      g_dbus_method_invocation_return_gerror (context, tp_error);
       g_error_free (tp_error);
       g_error_free (error);
     }
@@ -322,7 +322,7 @@ location_set_location (TpSvcConnectionInterfaceLocation1 *iface,
       GError error = { TP_ERROR, TP_ERROR_NOT_IMPLEMENTED,
           "Server does not support PEP, cannot publish geolocation" };
 
-      dbus_g_method_return_error (context, &error);
+      g_dbus_method_invocation_return_gerror (context, &error);
       return;
     }
 
@@ -341,7 +341,7 @@ location_set_location (TpSvcConnectionInterfaceLocation1 *iface,
             &err))
         {
           DEBUG ("%s", err->message);
-          dbus_g_method_return_error (context, err);
+          g_dbus_method_invocation_return_gerror (context, err);
           g_error_free (err);
           goto out;
         }
@@ -353,7 +353,7 @@ location_set_location (TpSvcConnectionInterfaceLocation1 *iface,
       GError error = { TP_ERROR, TP_ERROR_NETWORK_ERROR,
           "Failed to send msg" };
 
-      dbus_g_method_return_error (context, &error);
+      g_dbus_method_invocation_return_gerror (context, &error);
     }
 
 out:
diff --git a/src/conn-mail-notif.c b/src/conn-mail-notif.c
index 2f1ceeb06..62e27148b 100644
--- a/src/conn-mail-notif.c
+++ b/src/conn-mail-notif.c
@@ -113,7 +113,7 @@ return_from_request_inbox_url (GabbleConnection *conn)
     GDBusMethodInvocation *context = it->data;
 
     if (error != NULL)
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
     else
       tp_svc_connection_interface_mail_notification1_return_from_request_inbox_url (
           context, result);
@@ -144,7 +144,7 @@ check_supported_or_dbus_return (GabbleConnection *conn,
   if (tp_base_connection_get_status (base) != TP_CONNECTION_STATUS_CONNECTED)
     {
       GError e = { TP_ERROR, TP_ERROR_DISCONNECTED, "Not connected" };
-      dbus_g_method_return_error (context, &e);
+      g_dbus_method_invocation_return_gerror (context, &e);
       return TRUE;
     }
 
@@ -222,7 +222,7 @@ gabble_mail_notification_request_mail_url (
     {
       GError error = { TP_ERROR, TP_ERROR_NETWORK_ERROR,
           "Failed to retrieve URL from server."};
-      dbus_g_method_return_error (context, &error);
+      g_dbus_method_invocation_return_gerror (context, &error);
     }
 }
 
diff --git a/src/conn-power-saving.c b/src/conn-power-saving.c
index 0d8cc4608..050f7966b 100644
--- a/src/conn-power-saving.c
+++ b/src/conn-power-saving.c
@@ -95,7 +95,7 @@ toggle_google_queueing_cb (GObject *source_object,
 
       enabling = FALSE;
 
-      dbus_g_method_return_error (queueing_context->dbus_context, error);
+      g_dbus_method_invocation_return_gerror (queueing_context->dbus_context, error);
 
       g_error_free (error);
     }
diff --git a/src/conn-sidecars.c b/src/conn-sidecars.c
index 0bae824cf..cd1aea1ea 100644
--- a/src/conn-sidecars.c
+++ b/src/conn-sidecars.c
@@ -186,7 +186,7 @@ create_sidecar_cb (
     }
   else
     {
-      g_list_foreach (contexts, (GFunc) dbus_g_method_return_error, error);
+      g_list_foreach (contexts, (GFunc) g_dbus_method_invocation_return_gerror, error);
     }
 
   g_hash_table_remove (ctx->conn->pending_sidecars, ctx->sidecar_iface);
@@ -216,7 +216,7 @@ gabble_connection_ensure_sidecar (
           "This connection has already disconnected" };
 
       DEBUG ("already disconnected, declining request for %s", sidecar_iface);
-      dbus_g_method_return_error (context, &e);
+      g_dbus_method_invocation_return_gerror (context, &e);
       return;
     }
 
@@ -225,7 +225,7 @@ gabble_connection_ensure_sidecar (
       error->domain = TP_ERROR;
       error->code = TP_ERROR_INVALID_ARGUMENT;
       DEBUG ("%s is malformed: %s", sidecar_iface, error->message);
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_clear_error (&error);
       return;
     }
@@ -312,7 +312,7 @@ sidecars_conn_status_changed_cb (
 
           DEBUG ("failing all %u requests for %s", g_list_length (contexts),
               sidecar_iface);
-          g_list_foreach (contexts, (GFunc) dbus_g_method_return_error, error);
+          g_list_foreach (contexts, (GFunc) g_dbus_method_invocation_return_gerror, error);
           g_error_free (error);
         }
 
diff --git a/src/ft-channel.c b/src/ft-channel.c
index 52a2a45f8..bf3b2682e 100644
--- a/src/ft-channel.c
+++ b/src/ft-channel.c
@@ -1676,7 +1676,7 @@ gabble_file_transfer_channel_accept_file (TpSvcChannelTypeFileTransfer1 *iface,
     {
       g_set_error (&error, TP_ERROR, TP_ERROR_NOT_AVAILABLE,
           "Channel is not an incoming transfer");
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -1685,7 +1685,7 @@ gabble_file_transfer_channel_accept_file (TpSvcChannelTypeFileTransfer1 *iface,
     {
       g_set_error (&error, TP_ERROR, TP_ERROR_NOT_AVAILABLE,
         "State is not pending; cannot accept file");
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -1693,7 +1693,7 @@ gabble_file_transfer_channel_accept_file (TpSvcChannelTypeFileTransfer1 *iface,
   if (!check_address_and_access_control (self, address_type, access_control,
         access_control_param, &error))
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -1704,7 +1704,7 @@ gabble_file_transfer_channel_accept_file (TpSvcChannelTypeFileTransfer1 *iface,
       DEBUG ("Could not set up local socket");
       g_set_error (&error, TP_ERROR, TP_ERROR_NOT_AVAILABLE,
           "Could not set up local socket");
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -1776,7 +1776,7 @@ gabble_file_transfer_channel_provide_file (
     {
       g_set_error (&error, TP_ERROR, TP_ERROR_NOT_AVAILABLE,
           "Channel is not an outgoing transfer");
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -1786,7 +1786,7 @@ gabble_file_transfer_channel_provide_file (
     {
       g_set_error (&error, TP_ERROR, TP_ERROR_NOT_AVAILABLE,
         "State is not pending or accepted; cannot provide file");
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -1795,7 +1795,7 @@ gabble_file_transfer_channel_provide_file (
     {
       g_set_error (&error, TP_ERROR, TP_ERROR_NOT_AVAILABLE,
           "ProvideFile has already been called for this channel");
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -1803,7 +1803,7 @@ gabble_file_transfer_channel_provide_file (
   if (!check_address_and_access_control (self, address_type, access_control,
         access_control_param, &error))
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -1814,7 +1814,7 @@ gabble_file_transfer_channel_provide_file (
       DEBUG ("Could not set up local socket");
       g_set_error (&error, TP_ERROR, TP_ERROR_NOT_AVAILABLE,
           "Could not set up local socket");
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
diff --git a/src/muc-channel.c b/src/muc-channel.c
index b96025e6f..b7c0d55d5 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -1552,7 +1552,7 @@ return_from_set_subject (
     tp_svc_channel_interface_subject1_return_from_set_subject (
         priv->set_subject_context);
   else
-    dbus_g_method_return_error (priv->set_subject_context, error);
+    g_dbus_method_invocation_return_gerror (priv->set_subject_context, error);
 
   priv->set_subject_context = NULL;
   tp_clear_pointer (&priv->set_subject_stanza_id, g_free);
@@ -3238,7 +3238,7 @@ gabble_muc_channel_provide_password (TpSvcChannelInterfacePassword1 *iface,
     {
       GError error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE,
           "password cannot be provided in the current state" };
-      dbus_g_method_return_error (context, &error);
+      g_dbus_method_invocation_return_gerror (context, &error);
     }
   else
     {
@@ -4179,14 +4179,14 @@ gabble_muc_channel_set_subject (TpSvcChannelInterfaceSubject1 *iface,
       GError error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE,
           "Steady on. You're not in the room yet" };
 
-      dbus_g_method_return_error (context, &error);
+      g_dbus_method_invocation_return_gerror (context, &error);
     }
   else if (priv->state > MUC_STATE_JOINED || priv->closing)
     {
       GError error = { TP_ERROR, TP_ERROR_NOT_AVAILABLE,
           "Already left/leaving the room" };
 
-      dbus_g_method_return_error (context, &error);
+      g_dbus_method_invocation_return_gerror (context, &error);
     }
   else if (priv->set_subject_context != NULL)
     {
@@ -4194,7 +4194,7 @@ gabble_muc_channel_set_subject (TpSvcChannelInterfaceSubject1 *iface,
           "Hey! Stop changing the subject! (Your last request is still in "
           "flight.)" };
 
-      dbus_g_method_return_error (context, &error);
+      g_dbus_method_invocation_return_gerror (context, &error);
     }
   else
     {
diff --git a/src/search-channel.c b/src/search-channel.c
index 88fb39144..b322d5cc0 100644
--- a/src/search-channel.c
+++ b/src/search-channel.c
@@ -1226,7 +1226,7 @@ gabble_search_channel_search (TpSvcChannelTypeContactSearch1 *self,
     }
 
 err:
-  dbus_g_method_return_error (context, error);
+  g_dbus_method_invocation_return_gerror (context, error);
   g_error_free (error);
 }
 
@@ -1256,7 +1256,7 @@ gabble_search_channel_stop (TpSvcChannelTypeContactSearch1 *self,
           GError e = { TP_ERROR, TP_ERROR_NOT_AVAILABLE,
               "Search() hasn't been called yet" };
 
-          dbus_g_method_return_error (context, &e);
+          g_dbus_method_invocation_return_gerror (context, &e);
           break;
         }
       case TP_CHANNEL_CONTACT_SEARCH_STATE_MORE_AVAILABLE:
diff --git a/src/server-sasl-channel.c b/src/server-sasl-channel.c
index ccc8e621b..09040a76b 100644
--- a/src/server-sasl-channel.c
+++ b/src/server-sasl-channel.c
@@ -504,7 +504,7 @@ gabble_server_sasl_channel_raise (GDBusMethodInvocation *context,
   error = g_error_new_valist (TP_ERROR, code, message, ap);
   va_end (ap);
 
-  dbus_g_method_return_error (context, error);
+  g_dbus_method_invocation_return_gerror (context, error);
   g_error_free (error);
 }
 
diff --git a/src/tls-certificate.c b/src/tls-certificate.c
index 071985a88..0cada47ca 100644
--- a/src/tls-certificate.c
+++ b/src/tls-certificate.c
@@ -272,7 +272,7 @@ gabble_tls_certificate_accept (TpSvcAuthenticationTLSCertificate *cert,
           "doesn't make sense."
         };
 
-      dbus_g_method_return_error (context, &error);
+      g_dbus_method_invocation_return_gerror (context, &error);
       return;
     }
 
@@ -298,7 +298,7 @@ gabble_tls_certificate_reject (TpSvcAuthenticationTLSCertificate *cert,
       GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Calling Reject() with a zero-length rejection list." };
 
-      dbus_g_method_return_error (context, &error);
+      g_dbus_method_invocation_return_gerror (context, &error);
       return;
     }
 
@@ -311,7 +311,7 @@ gabble_tls_certificate_reject (TpSvcAuthenticationTLSCertificate *cert,
           "doesn't make sense."
         };
 
-      dbus_g_method_return_error (context, &error);
+      g_dbus_method_invocation_return_gerror (context, &error);
       return;
     }
 
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index 62e039874..ecd69311a 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -1670,7 +1670,7 @@ gabble_tube_dbus_offer_async (TpSvcChannelTypeDBusTube1 *self,
 
   if (!gabble_tube_dbus_check_access_control (tube, access_control, &error))
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -1687,7 +1687,7 @@ gabble_tube_dbus_offer_async (TpSvcChannelTypeDBusTube1 *self,
   else
     {
       g_assert (error != NULL);
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
     }
 }
@@ -1708,7 +1708,7 @@ gabble_tube_dbus_accept_async (TpSvcChannelTypeDBusTube1 *self,
 
   if (!gabble_tube_dbus_check_access_control (tube, access_control, &error))
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -1722,7 +1722,7 @@ gabble_tube_dbus_accept_async (TpSvcChannelTypeDBusTube1 *self,
   else
     {
       g_assert (error != NULL);
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
     }
 }
diff --git a/src/tube-stream.c b/src/tube-stream.c
index 5c0a8afdd..acf67c083 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -2245,7 +2245,7 @@ gabble_tube_stream_offer_async (TpSvcChannelTypeStreamTube1 *iface,
     {
       g_set_error (&error, TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
           "Tube is not in the not offered state");
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -2253,7 +2253,7 @@ gabble_tube_stream_offer_async (TpSvcChannelTypeStreamTube1 *iface,
   if (!gabble_tube_stream_check_params (address_type, address,
         access_control, NULL, &error))
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }
@@ -2273,7 +2273,7 @@ gabble_tube_stream_offer_async (TpSvcChannelTypeStreamTube1 *iface,
     {
       gabble_tube_iface_stream_close (GABBLE_TUBE_IFACE (self), TRUE);
 
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
 
       g_error_free (error);
       return;
@@ -2319,7 +2319,7 @@ gabble_tube_stream_accept_async (TpSvcChannelTypeStreamTube1 *iface,
 
   if (!gabble_tube_stream_accept (GABBLE_TUBE_IFACE (self), &error))
     {
-      dbus_g_method_return_error (context, error);
+      g_dbus_method_invocation_return_gerror (context, error);
       g_error_free (error);
       return;
     }