Use GDBusMethodInvocation

Automated:
  git grep -lz DBusGMethodInvocation |
  xargs -0 perl -pi -e 's/\bDBusGMethodInvocation\b/GDBusMethodInvocation/g'

22 files changed, 66 insertions, 66 deletions

diff --git a/plugins/console/channel.c b/plugins/console/channel.c
index 3ddbef905..99cb907e5 100644
--- a/plugins/console/channel.c
+++ b/plugins/console/channel.c
@@ -286,7 +286,7 @@ return_from_send_iq (
     gpointer user_data)
 {
   GabbleConsoleChannel *self = GABBLE_CONSOLE_CHANNEL (source);
-  DBusGMethodInvocation *context = user_data;
+  GDBusMethodInvocation *context = user_data;
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (result);
   GError *error = NULL;
 
@@ -419,7 +419,7 @@ console_send_iq (
     const gchar *type_str,
     const gchar *to,
     const gchar *body,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleConsoleChannel *self = GABBLE_CONSOLE_CHANNEL (channel);
   WockyPorter *porter = wocky_session_get_porter (self->priv->session);
@@ -456,7 +456,7 @@ console_stanza_sent_cb (
     gpointer user_data)
 {
   WockyPorter *porter = WOCKY_PORTER (source);
-  DBusGMethodInvocation *context = user_data;
+  GDBusMethodInvocation *context = user_data;
   GError *error = NULL;
 
   if (wocky_porter_send_finish (porter, result, &error))
@@ -503,7 +503,7 @@ static void
 console_send_stanza (
     GabbleSvcGabblePluginConsole *channel,
     const gchar *xml,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleConsoleChannel *self = GABBLE_CONSOLE_CHANNEL (channel);
   WockyPorter *porter = wocky_session_get_porter (self->priv->session);
diff --git a/plugins/gateways.c b/plugins/gateways.c
index eae683518..6df431c93 100644
--- a/plugins/gateways.c
+++ b/plugins/gateways.c
@@ -373,12 +373,12 @@ static void sidecar_iface_init (
 
 typedef struct
 {
-  DBusGMethodInvocation *context;
+  GDBusMethodInvocation *context;
   gchar *gateway;
 } PendingRegistration;
 
 static PendingRegistration *
-pending_registration_new (DBusGMethodInvocation *context,
+pending_registration_new (GDBusMethodInvocation *context,
     const gchar *gateway)
 {
   PendingRegistration *pr = g_slice_new (PendingRegistration);
@@ -477,7 +477,7 @@ gateways_register (
     const gchar *gateway,
     const gchar *username,
     const gchar *password,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleGatewaySidecar *self = GABBLE_GATEWAY_SIDECAR (sidecar);
   WockyPorter *porter = wocky_session_get_porter (self->priv->session);
diff --git a/src/conn-addressing.c b/src/conn-addressing.c
index 834446fe6..fdc6b6083 100644
--- a/src/conn-addressing.c
+++ b/src/conn-addressing.c
@@ -72,7 +72,7 @@ static void
 conn_addressing_get_contacts_by_uri (TpSvcConnectionInterfaceAddressing1 *iface,
     const gchar **uris,
     const gchar **interfaces,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   const gchar **uri;
   TpBaseConnection *base = TP_BASE_CONNECTION (iface);
@@ -110,7 +110,7 @@ conn_addressing_get_contacts_by_vcard_field (TpSvcConnectionInterfaceAddressing1
     const gchar *field,
     const gchar **addresses,
     const gchar **interfaces,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   const gchar **address;
   TpBaseConnection *base = TP_BASE_CONNECTION (iface);
diff --git a/src/conn-aliasing.c b/src/conn-aliasing.c
index 3f803f151..88aeeb255 100644
--- a/src/conn-aliasing.c
+++ b/src/conn-aliasing.c
@@ -50,7 +50,7 @@ typedef struct _AliasesRequest AliasesRequest;
 struct _AliasesRequest
 {
   GabbleConnection *conn;
-  DBusGMethodInvocation *request_call;
+  GDBusMethodInvocation *request_call;
   guint pending_vcard_requests;
   guint pending_pep_requests;
   GArray *contacts;
@@ -67,7 +67,7 @@ typedef struct
 
 static AliasesRequest *
 aliases_request_new (GabbleConnection *conn,
-                     DBusGMethodInvocation *request_call,
+                     GDBusMethodInvocation *request_call,
                      const GArray *contacts)
 {
   AliasesRequest *request;
@@ -358,7 +358,7 @@ gabble_do_pep_request (GabbleConnection *self,
 static void
 gabble_connection_request_aliases (TpSvcConnectionInterfaceAliasing1 *iface,
                                    const GArray *contacts,
-                                   DBusGMethodInvocation *context)
+                                   GDBusMethodInvocation *context)
 {
   GabbleConnection *self = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) self;
@@ -564,7 +564,7 @@ set_one_alias (
 static void
 gabble_connection_set_aliases (TpSvcConnectionInterfaceAliasing1 *iface,
                                GHashTable *aliases,
-                               DBusGMethodInvocation *context)
+                               GDBusMethodInvocation *context)
 {
   GabbleConnection *self = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) self;
diff --git a/src/conn-avatars.c b/src/conn-avatars.c
index 2d0cb88f9..d22eef709 100644
--- a/src/conn-avatars.c
+++ b/src/conn-avatars.c
@@ -122,7 +122,7 @@ static const char *mimetypes[] = {
 
 typedef struct {
   GabbleConnection *conn;
-  DBusGMethodInvocation *invocation;
+  GDBusMethodInvocation *invocation;
   GHashTable *ret;
   gulong signal_conn;
 } GetKnownAvatarTokensContext;
@@ -164,7 +164,7 @@ _got_self_avatar_for_get_known_avatar_tokens (GObject *obj,
 static void
 gabble_connection_get_known_avatar_tokens (TpSvcConnectionInterfaceAvatars1 *iface,
                                            const GArray *contacts,
-                                           DBusGMethodInvocation *invocation)
+                                           GDBusMethodInvocation *invocation)
 {
   GabbleConnection *self = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) self;
@@ -371,7 +371,7 @@ request_avatars_cb (GabbleVCardManager *manager,
 static void
 gabble_connection_request_avatars (TpSvcConnectionInterfaceAvatars1 *iface,
                                    const GArray *contacts,
-                                   DBusGMethodInvocation *context)
+                                   GDBusMethodInvocation *context)
 {
   GabbleConnection *self = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) self;
@@ -425,7 +425,7 @@ gabble_connection_request_avatars (TpSvcConnectionInterfaceAvatars1 *iface,
 
 struct _set_avatar_ctx {
   GabbleConnection *conn;
-  DBusGMethodInvocation *invocation;
+  GDBusMethodInvocation *invocation;
   GString *avatar;
 };
 
@@ -513,7 +513,7 @@ static void
 gabble_connection_set_avatar (TpSvcConnectionInterfaceAvatars1 *iface,
                               const GArray *avatar,
                               const gchar *mime_type,
-                              DBusGMethodInvocation *context)
+                              GDBusMethodInvocation *context)
 {
   GabbleConnection *self = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) self;
@@ -579,7 +579,7 @@ gabble_connection_set_avatar (TpSvcConnectionInterfaceAvatars1 *iface,
  */
 static void
 gabble_connection_clear_avatar (TpSvcConnectionInterfaceAvatars1 *iface,
-                                DBusGMethodInvocation *context)
+                                GDBusMethodInvocation *context)
 {
   gabble_connection_set_avatar (iface, NULL, NULL, context);
 }
diff --git a/src/conn-client-types.c b/src/conn-client-types.c
index 7da31dce0..9f3c056f6 100644
--- a/src/conn-client-types.c
+++ b/src/conn-client-types.c
@@ -81,7 +81,7 @@ get_client_types_from_handle (GabbleConnection *conn,
 static void
 client_types_request_client_types (TpSvcConnectionInterfaceClientTypes1 *iface,
     TpHandle contact,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleConnection *conn = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) conn;
diff --git a/src/conn-contact-info.c b/src/conn-contact-info.c
index 5295b0f61..b29aac07d 100644
--- a/src/conn-contact-info.c
+++ b/src/conn-contact-info.c
@@ -412,7 +412,7 @@ _request_vcards_cb (GabbleVCardManager *manager,
 static void
 _return_from_request_contact_info (WockyNode *vcard_node,
                                    GError *vcard_error,
-                                   DBusGMethodInvocation *context)
+                                   GDBusMethodInvocation *context)
 {
   GError *error = NULL;
   GPtrArray *contact_info;
@@ -465,7 +465,7 @@ _request_vcard_cb (GabbleVCardManager *self,
                    GError *vcard_error,
                    gpointer user_data)
 {
-  DBusGMethodInvocation *context = user_data;
+  GDBusMethodInvocation *context = user_data;
 
   _return_from_request_contact_info (vcard_node, vcard_error, context);
 }
@@ -482,7 +482,7 @@ _request_vcard_cb (GabbleVCardManager *self,
 static void
 gabble_connection_refresh_contact_info (TpSvcConnectionInterfaceContactInfo1 *iface,
                                         const GArray *contacts,
-                                        DBusGMethodInvocation *context)
+                                        GDBusMethodInvocation *context)
 {
   GabbleConnection *self = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) self;
@@ -537,7 +537,7 @@ gabble_connection_refresh_contact_info (TpSvcConnectionInterfaceContactInfo1 *if
 static void
 gabble_connection_request_contact_info (TpSvcConnectionInterfaceContactInfo1 *iface,
                                         guint contact,
-                                        DBusGMethodInvocation *context)
+                                        GDBusMethodInvocation *context)
 {
   GabbleConnection *self = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) self;
@@ -634,7 +634,7 @@ _set_contact_info_cb (GabbleVCardManager *vcard_manager,
                       GError *vcard_error,
                       gpointer user_data)
 {
-  DBusGMethodInvocation *context = user_data;
+  GDBusMethodInvocation *context = user_data;
 
   if (vcard_node == NULL)
     {
@@ -667,7 +667,7 @@ _set_contact_info_cb (GabbleVCardManager *vcard_manager,
 static void
 gabble_connection_set_contact_info (TpSvcConnectionInterfaceContactInfo1 *iface,
                                     const GPtrArray *contact_info,
-                                    DBusGMethodInvocation *context)
+                                    GDBusMethodInvocation *context)
 {
   GabbleConnection *self = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) self;
diff --git a/src/conn-location.c b/src/conn-location.c
index 54a76d3e7..2922e705c 100644
--- a/src/conn-location.c
+++ b/src/conn-location.c
@@ -114,7 +114,7 @@ get_cached_location (GabbleConnection *conn,
 typedef struct {
     GabbleConnection *self;
     TpHandle handle;
-    DBusGMethodInvocation *context;
+    GDBusMethodInvocation *context;
 } YetAnotherContextStruct;
 
 static void
@@ -172,7 +172,7 @@ static void
 location_request_location (
     TpSvcConnectionInterfaceLocation1 *iface,
     TpHandle handle,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleConnection *self = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) self;
@@ -281,7 +281,7 @@ set_location_sent_cb (GabbleConnection *conn,
     GObject *object,
     gpointer user_data)
 {
-  DBusGMethodInvocation *context = user_data;
+  GDBusMethodInvocation *context = user_data;
   GError *error = NULL;
 
   if (!wocky_stanza_extract_errors (reply_msg, NULL, &error, NULL, NULL))
@@ -304,7 +304,7 @@ set_location_sent_cb (GabbleConnection *conn,
 static void
 location_set_location (TpSvcConnectionInterfaceLocation1 *iface,
                        GHashTable *location,
-                       DBusGMethodInvocation *context)
+                       GDBusMethodInvocation *context)
 {
   GabbleConnection *conn = GABBLE_CONNECTION (iface);
   WockyStanza *msg;
diff --git a/src/conn-mail-notif.c b/src/conn-mail-notif.c
index 9537fd859..2f1ceeb06 100644
--- a/src/conn-mail-notif.c
+++ b/src/conn-mail-notif.c
@@ -70,7 +70,7 @@ struct _GabbleConnectionMailNotificationPrivate
   guint new_mail_handler_id;
   guint poll_timeout_id;
   guint poll_count;
-  GList *inbox_url_requests; /* list of DBusGMethodInvocation */
+  GList *inbox_url_requests; /* list of GDBusMethodInvocation */
   gboolean should_set_google_settings;
 };
 
@@ -110,7 +110,7 @@ return_from_request_inbox_url (GabbleConnection *conn)
 
   while (it != NULL)
   {
-    DBusGMethodInvocation *context = it->data;
+    GDBusMethodInvocation *context = it->data;
 
     if (error != NULL)
       dbus_g_method_return_error (context, error);
@@ -137,7 +137,7 @@ return_from_request_inbox_url (GabbleConnection *conn)
 
 static inline gboolean
 check_supported_or_dbus_return (GabbleConnection *conn,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   TpBaseConnection *base = TP_BASE_CONNECTION (conn);
 
@@ -160,7 +160,7 @@ check_supported_or_dbus_return (GabbleConnection *conn,
 static void
 gabble_mail_notification_request_inbox_url (
     TpSvcConnectionInterfaceMailNotification1 *iface,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleConnection *conn = GABBLE_CONNECTION (iface);
   GabbleConnectionMailNotificationPrivate *priv = conn->mail_priv;
@@ -182,7 +182,7 @@ gabble_mail_notification_request_mail_url (
     TpSvcConnectionInterfaceMailNotification1 *iface,
     const gchar *in_id,
     const GValue *in_url_data,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleConnection *conn = GABBLE_CONNECTION (iface);
   GabbleConnectionMailNotificationPrivate *priv = conn->mail_priv;
diff --git a/src/conn-power-saving.c b/src/conn-power-saving.c
index dd7499087..0d8cc4608 100644
--- a/src/conn-power-saving.c
+++ b/src/conn-power-saving.c
@@ -36,7 +36,7 @@ enum
 };
 
 typedef struct {
-  DBusGMethodInvocation *dbus_context;
+  GDBusMethodInvocation *dbus_context;
   gboolean enabling;
 } ToggleQueueingContext;
 
@@ -119,7 +119,7 @@ static void
 conn_power_saving_set_power_saving (
     TpSvcConnectionInterfacePowerSaving1 *conn,
     gboolean enable,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleConnection *self = GABBLE_CONNECTION (conn);
   TpBaseConnection *base = TP_BASE_CONNECTION (self);
diff --git a/src/conn-sidecars.c b/src/conn-sidecars.c
index 87407a485..0bae824cf 100644
--- a/src/conn-sidecars.c
+++ b/src/conn-sidecars.c
@@ -202,7 +202,7 @@ static void
 gabble_connection_ensure_sidecar (
     TpSvcConnectionInterfaceSidecars1 *iface,
     const gchar *sidecar_iface,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleConnection *conn = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = TP_BASE_CONNECTION (conn);
diff --git a/src/connection.c b/src/connection.c
index 5c052f005..4823c7ace 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -3214,7 +3214,7 @@ static void
 gabble_connection_update_capabilities (
     TpSvcConnectionInterfaceContactCapabilities1 *iface,
     const GPtrArray *clients,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleConnection *self = GABBLE_CONNECTION (iface);
   TpBaseConnection *base = (TpBaseConnection *) self;
diff --git a/src/connection.h b/src/connection.h
index 1c68cb0dd..76a3807ee 100644
--- a/src/connection.h
+++ b/src/connection.h
@@ -228,7 +228,7 @@ struct _GabbleConnection {
     /* gchar *interface → GabbleSidecar */
     GHashTable *sidecars;
 
-    /* gchar *interface → GList<DBusGMethodInvocation> */
+    /* gchar *interface → GList<GDBusMethodInvocation> */
     GHashTable *pending_sidecars;
 
     /* Mail Notification */
diff --git a/src/ft-channel.c b/src/ft-channel.c
index 9afee0074..52a2a45f8 100644
--- a/src/ft-channel.c
+++ b/src/ft-channel.c
@@ -1666,7 +1666,7 @@ gabble_file_transfer_channel_accept_file (TpSvcChannelTypeFileTransfer1 *iface,
                                           guint access_control,
                                           const GValue *access_control_param,
                                           guint64 offset,
-                                          DBusGMethodInvocation *context)
+                                          GDBusMethodInvocation *context)
 {
   GabbleFileTransferChannel *self = GABBLE_FILE_TRANSFER_CHANNEL (iface);
   TpBaseChannel *base = TP_BASE_CHANNEL (self);
@@ -1767,7 +1767,7 @@ gabble_file_transfer_channel_provide_file (
     guint address_type,
     guint access_control,
     const GValue *access_control_param,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleFileTransferChannel *self = GABBLE_FILE_TRANSFER_CHANNEL (iface);
   GError *error = NULL;
diff --git a/src/im-channel.c b/src/im-channel.c
index a83dec95e..45871a19a 100644
--- a/src/im-channel.c
+++ b/src/im-channel.c
@@ -662,7 +662,7 @@ gabble_im_channel_close (TpBaseChannel *base_chan)
  */
 static void
 gabble_im_channel_destroy (TpSvcChannelInterfaceDestroyable1 *iface,
-                           DBusGMethodInvocation *context)
+                           GDBusMethodInvocation *context)
 {
   g_assert (GABBLE_IS_IM_CHANNEL (iface));
 
diff --git a/src/muc-channel.c b/src/muc-channel.c
index 69fe9ed81..b96025e6f 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -158,7 +158,7 @@ struct _GabbleMucChannelPrivate
   guint leave_timer_id;
 
   gboolean must_provide_password;
-  DBusGMethodInvocation *password_ctx;
+  GDBusMethodInvocation *password_ctx;
 
   const gchar *jid;
   gboolean requested;
@@ -182,7 +182,7 @@ struct _GabbleMucChannelPrivate
   gchar *subject_actor;
   gint64 subject_timestamp;
   gboolean can_set_subject;
-  DBusGMethodInvocation *set_subject_context;
+  GDBusMethodInvocation *set_subject_context;
   gchar *set_subject_stanza_id;
 
   gboolean ready;
@@ -3198,7 +3198,7 @@ gabble_muc_channel_close (TpBaseChannel *base)
  */
 static void
 gabble_muc_channel_get_password_flags (TpSvcChannelInterfacePassword1 *iface,
-                                       DBusGMethodInvocation *context)
+                                       GDBusMethodInvocation *context)
 {
   GabbleMucChannel *self = GABBLE_MUC_CHANNEL (iface);
   GabbleMucChannelPrivate *priv;
@@ -3224,7 +3224,7 @@ gabble_muc_channel_get_password_flags (TpSvcChannelInterfacePassword1 *iface,
 static void
 gabble_muc_channel_provide_password (TpSvcChannelInterfacePassword1 *iface,
                                      const gchar *password,
-                                     DBusGMethodInvocation *context)
+                                     GDBusMethodInvocation *context)
 {
   GabbleMucChannel *self = GABBLE_MUC_CHANNEL (iface);
   GabbleMucChannelPrivate *priv;
@@ -4166,7 +4166,7 @@ sent_subject_cb (
 static void
 gabble_muc_channel_set_subject (TpSvcChannelInterfaceSubject1 *iface,
     const gchar *subject,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleMucChannel *self = GABBLE_MUC_CHANNEL (iface);
   GabbleMucChannelPrivate *priv = self->priv;
diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c
index d56a819cf..2686148b1 100644
--- a/src/roomlist-channel.c
+++ b/src/roomlist-channel.c
@@ -480,7 +480,7 @@ gabble_roomlist_channel_close (TpBaseChannel *base)
 
 static void
 gabble_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList1 *iface,
-                                           DBusGMethodInvocation *context)
+                                           GDBusMethodInvocation *context)
 {
   GabbleRoomlistChannel *self = GABBLE_ROOMLIST_CHANNEL (iface);
   GabbleRoomlistChannelPrivate *priv;
@@ -494,7 +494,7 @@ gabble_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList1 *iface,
 
 static void
 gabble_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList1 *iface,
-                                    DBusGMethodInvocation *context)
+                                    GDBusMethodInvocation *context)
 {
   GabbleRoomlistChannel *self = GABBLE_ROOMLIST_CHANNEL (iface);
   GabbleRoomlistChannelPrivate *priv = self->priv;
@@ -519,7 +519,7 @@ gabble_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList1 *iface,
 
 static void
 gabble_roomlist_channel_stop_listing (TpSvcChannelTypeRoomList1 *iface,
-                                      DBusGMethodInvocation *context)
+                                      GDBusMethodInvocation *context)
 {
   GabbleRoomlistChannel *self = GABBLE_ROOMLIST_CHANNEL (iface);
 
diff --git a/src/search-channel.c b/src/search-channel.c
index 89ca7b907..88fb39144 100644
--- a/src/search-channel.c
+++ b/src/search-channel.c
@@ -1206,7 +1206,7 @@ gabble_search_channel_class_init (GabbleSearchChannelClass *klass)
 static void
 gabble_search_channel_search (TpSvcChannelTypeContactSearch1 *self,
                               GHashTable *terms,
-                              DBusGMethodInvocation *context)
+                              GDBusMethodInvocation *context)
 {
   GabbleSearchChannel *chan = GABBLE_SEARCH_CHANNEL (self);
   GabbleSearchChannelPrivate *priv = chan->priv;
@@ -1232,7 +1232,7 @@ err:
 
 static void
 gabble_search_channel_stop (TpSvcChannelTypeContactSearch1 *self,
-                            DBusGMethodInvocation *context)
+                            GDBusMethodInvocation *context)
 {
   GabbleSearchChannel *chan = GABBLE_SEARCH_CHANNEL (self);
   GabbleSearchChannelPrivate *priv = chan->priv;
diff --git a/src/server-sasl-channel.c b/src/server-sasl-channel.c
index bc95f547c..ccc8e621b 100644
--- a/src/server-sasl-channel.c
+++ b/src/server-sasl-channel.c
@@ -488,11 +488,11 @@ complete_operation (
  */
 
 static void gabble_server_sasl_channel_raise (
-    DBusGMethodInvocation *context, TpError code, const gchar *message,
+    GDBusMethodInvocation *context, TpError code, const gchar *message,
     ...) G_GNUC_PRINTF (3, 4);
 
 static void
-gabble_server_sasl_channel_raise (DBusGMethodInvocation *context,
+gabble_server_sasl_channel_raise (GDBusMethodInvocation *context,
     TpError code,
     const gchar *message,
     ...)
@@ -515,7 +515,7 @@ gabble_server_sasl_channel_start_mechanism_with_data (
     TpSvcChannelInterfaceSASLAuthentication1 *iface,
     const gchar *in_Mechanism,
     const GArray *in_InitialData,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleServerSaslChannel *self = GABBLE_SERVER_SASL_CHANNEL (iface);
   GabbleServerSaslChannelPrivate *priv = self->priv;
@@ -580,7 +580,7 @@ static void
 gabble_server_sasl_channel_start_mechanism (
     TpSvcChannelInterfaceSASLAuthentication1 *iface,
     const gchar *mech,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   gabble_server_sasl_channel_start_mechanism_with_data (iface, mech, NULL,
       context);
@@ -590,7 +590,7 @@ static void
 gabble_server_sasl_channel_respond (
     TpSvcChannelInterfaceSASLAuthentication1 *channel,
     const GArray *in_Response_Data,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleServerSaslChannel *self =
     GABBLE_SERVER_SASL_CHANNEL (channel);
@@ -639,7 +639,7 @@ gabble_server_sasl_channel_respond (
 static void
 gabble_server_sasl_channel_accept_sasl (
     TpSvcChannelInterfaceSASLAuthentication1 *channel,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleServerSaslChannel *self = GABBLE_SERVER_SASL_CHANNEL (channel);
   GabbleServerSaslChannelPrivate *priv = self->priv;
@@ -731,7 +731,7 @@ gabble_server_sasl_channel_abort_sasl (
     TpSvcChannelInterfaceSASLAuthentication1 *channel,
     guint in_Reason,
     const gchar *in_Debug_Message,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleServerSaslChannel *self = GABBLE_SERVER_SASL_CHANNEL (channel);
   GabbleServerSaslChannelPrivate *priv = self->priv;
diff --git a/src/tls-certificate.c b/src/tls-certificate.c
index c00bac7a8..071985a88 100644
--- a/src/tls-certificate.c
+++ b/src/tls-certificate.c
@@ -256,7 +256,7 @@ gabble_tls_certificate_class_init (GabbleTLSCertificateClass *klass)
 
 static void
 gabble_tls_certificate_accept (TpSvcAuthenticationTLSCertificate *cert,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleTLSCertificate *self = GABBLE_TLS_CERTIFICATE (cert);
 
@@ -285,7 +285,7 @@ gabble_tls_certificate_accept (TpSvcAuthenticationTLSCertificate *cert,
 static void
 gabble_tls_certificate_reject (TpSvcAuthenticationTLSCertificate *cert,
     const GPtrArray *rejections,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleTLSCertificate *self = GABBLE_TLS_CERTIFICATE (cert);
 
diff --git a/src/tube-dbus.c b/src/tube-dbus.c
index 9e8ac2100..62e039874 100644
--- a/src/tube-dbus.c
+++ b/src/tube-dbus.c
@@ -1662,7 +1662,7 @@ static void
 gabble_tube_dbus_offer_async (TpSvcChannelTypeDBusTube1 *self,
     GHashTable *parameters,
     guint access_control,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleTubeDBus *tube = GABBLE_TUBE_DBUS (self);
   GabbleTubeDBusPrivate *priv = GABBLE_TUBE_DBUS_GET_PRIVATE (tube);
@@ -1701,7 +1701,7 @@ gabble_tube_dbus_offer_async (TpSvcChannelTypeDBusTube1 *self,
 static void
 gabble_tube_dbus_accept_async (TpSvcChannelTypeDBusTube1 *self,
     guint access_control,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleTubeDBus *tube = GABBLE_TUBE_DBUS (self);
   GError *error = NULL;
diff --git a/src/tube-stream.c b/src/tube-stream.c
index fb9c4a484..5c0a8afdd 100644
--- a/src/tube-stream.c
+++ b/src/tube-stream.c
@@ -2233,7 +2233,7 @@ gabble_tube_stream_offer_async (TpSvcChannelTypeStreamTube1 *iface,
     const GValue *address,
     guint access_control,
     GHashTable *parameters,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleTubeStream *self = GABBLE_TUBE_STREAM (iface);
   GabbleTubeStreamPrivate *priv = self->priv;
@@ -2304,7 +2304,7 @@ gabble_tube_stream_accept_async (TpSvcChannelTypeStreamTube1 *iface,
     guint address_type,
     guint access_control,
     const GValue *access_control_param,
-    DBusGMethodInvocation *context)
+    GDBusMethodInvocation *context)
 {
   GabbleTubeStream *self = GABBLE_TUBE_STREAM (iface);
   GabbleTubeStreamPrivate *priv = self->priv;