diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-18 18:17:09 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-24 18:07:10 +0000 |
commit | 02af0f5eef7405c14edeb8fdd33379d08b5e542f (patch) | |
tree | fab2e7948f9d9a2b395d56b0096c38e545151103 | |
parent | cacfee38ef48a817de1dd366790b6c85a63bfc8f (diff) |
Replace DBusGMethodInvocation with GDBusMethodInvocation
Excluding tools/ again.
Automated:
git grep -lz DBusGMethodInvocation |
xargs -0 perl -pi -e 's/\bDBusGMethodInvocation\b/GDBusMethodInvocation/g'
-rw-r--r-- | src/connection-contact-info.c | 4 | ||||
-rw-r--r-- | src/connection.c | 20 | ||||
-rw-r--r-- | src/file-transfer-channel.c | 4 | ||||
-rw-r--r-- | src/roomlist-channel.c | 6 | ||||
-rw-r--r-- | src/tube-dbus.c | 4 | ||||
-rw-r--r-- | src/tube-stream.c | 4 |
6 files changed, 21 insertions, 21 deletions
diff --git a/src/connection-contact-info.c b/src/connection-contact-info.c index 883bdd80..dc160a59 100644 --- a/src/connection-contact-info.c +++ b/src/connection-contact-info.c @@ -247,7 +247,7 @@ static void salut_conn_contact_info_request_contact_info ( TpSvcConnectionInterfaceContactInfo1 *iface, guint handle, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { SalutConnection *self = SALUT_CONNECTION (iface); TpBaseConnection *base = (TpBaseConnection *) self; @@ -295,7 +295,7 @@ static void salut_conn_contact_info_refresh_contact_info ( TpSvcConnectionInterfaceContactInfo1 *iface, const GArray *contacts, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { /* This is a no-op on link-local XMPP: everything's always pushed to us. */ tp_svc_connection_interface_contact_info1_return_from_refresh_contact_info (context); diff --git a/src/connection.c b/src/connection.c index 91a11743..5a6617e3 100644 --- a/src/connection.c +++ b/src/connection.c @@ -180,7 +180,7 @@ struct _SalutConnectionPrivate /* gchar *interface → SalutSidecar */ GHashTable *sidecars; - /* gchar *interface → GList<DBusGMethodInvocation> */ + /* gchar *interface → GList<GDBusMethodInvocation> */ GHashTable *pending_sidecars; /* timer used when trying to properly disconnect */ @@ -197,7 +197,7 @@ typedef struct _ChannelRequest ChannelRequest; struct _ChannelRequest { - DBusGMethodInvocation *context; + GDBusMethodInvocation *context; gchar *channel_type; guint handle_type; guint handle; @@ -1201,7 +1201,7 @@ salut_connection_get_alias (SalutConnection *self, TpHandle handle) */ static void salut_connection_request_aliases (TpSvcConnectionInterfaceAliasing1 *iface, - const GArray *contacts, DBusGMethodInvocation *context) + const GArray *contacts, GDBusMethodInvocation *context) { SalutConnection *self = SALUT_CONNECTION (iface); TpBaseConnection *base = TP_BASE_CONNECTION (self); @@ -1341,7 +1341,7 @@ conn_contact_capabilities_fill_contact_attributes (SalutConnection *self, static void salut_connection_set_aliases (TpSvcConnectionInterfaceAliasing1 *iface, - GHashTable *aliases, DBusGMethodInvocation *context) + GHashTable *aliases, GDBusMethodInvocation *context) { SalutConnection *self = SALUT_CONNECTION (iface); TpBaseConnection *base = (TpBaseConnection *) self; @@ -1415,7 +1415,7 @@ _contact_manager_contact_avatar_changed (SalutConnection *self, static void salut_connection_clear_avatar (TpSvcConnectionInterfaceAvatars1 *iface, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { SalutConnection *self = SALUT_CONNECTION (iface); SalutConnectionPrivate *priv = self->priv; @@ -1436,7 +1436,7 @@ salut_connection_clear_avatar (TpSvcConnectionInterfaceAvatars1 *iface, static void salut_connection_set_avatar (TpSvcConnectionInterfaceAvatars1 *iface, const GArray *avatar, const gchar *mime_type, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { SalutConnection *self = SALUT_CONNECTION (iface); SalutConnectionPrivate *priv = self->priv; @@ -1465,7 +1465,7 @@ static void salut_connection_get_known_avatar_tokens ( TpSvcConnectionInterfaceAvatars1 *iface, const GArray *contacts, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { guint i; GHashTable *ret; @@ -1598,7 +1598,7 @@ static void salut_connection_request_avatars ( TpSvcConnectionInterfaceAvatars1 *iface, const GArray *contacts, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { guint i; GError *err = NULL; @@ -1796,7 +1796,7 @@ static void salut_connection_update_capabilities ( TpSvcConnectionInterfaceContactCapabilities1 *iface, const GPtrArray *clients, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { SalutConnection *self = SALUT_CONNECTION (iface); TpBaseConnection *base = (TpBaseConnection *) self; @@ -2349,7 +2349,7 @@ static void salut_connection_ensure_sidecar ( TpSvcConnectionInterfaceSidecars1 *iface, const gchar *sidecar_iface, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { SalutConnection *conn = SALUT_CONNECTION (iface); SalutConnectionPrivate *priv = conn->priv; diff --git a/src/file-transfer-channel.c b/src/file-transfer-channel.c index a21a312f..4e58717b 100644 --- a/src/file-transfer-channel.c +++ b/src/file-transfer-channel.c @@ -1196,7 +1196,7 @@ salut_file_transfer_channel_accept_file (TpSvcChannelTypeFileTransfer1 *iface, guint access_control, const GValue *access_control_param, guint64 offset, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { SalutFileTransferChannel *self = SALUT_FILE_TRANSFER_CHANNEL (iface); GError *error = NULL; @@ -1272,7 +1272,7 @@ salut_file_transfer_channel_provide_file ( guint address_type, guint access_control, const GValue *access_control_param, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { SalutFileTransferChannel *self = SALUT_FILE_TRANSFER_CHANNEL (iface); TpBaseChannel *base = TP_BASE_CHANNEL (self); diff --git a/src/roomlist-channel.c b/src/roomlist-channel.c index 5efb94c0..d9162e19 100644 --- a/src/roomlist-channel.c +++ b/src/roomlist-channel.c @@ -309,7 +309,7 @@ salut_roomlist_channel_remove_room (SalutRoomlistChannel *self, */ static void salut_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList1 *iface, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { SalutRoomlistChannel *self = SALUT_ROOMLIST_CHANNEL (iface); @@ -334,7 +334,7 @@ salut_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList1 *iface, */ static void salut_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList1 *iface, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { SalutRoomlistChannel *self = SALUT_ROOMLIST_CHANNEL (iface); SalutRoomlistChannelPrivate *priv = self->priv; @@ -354,7 +354,7 @@ salut_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList1 *iface, */ static void salut_roomlist_channel_stop_listing (TpSvcChannelTypeRoomList1 *iface, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { tp_svc_channel_type_room_list1_return_from_stop_listing (context); } diff --git a/src/tube-dbus.c b/src/tube-dbus.c index b7db3bce..85522f48 100644 --- a/src/tube-dbus.c +++ b/src/tube-dbus.c @@ -1542,7 +1542,7 @@ static void salut_tube_dbus_offer_async (TpSvcChannelTypeDBusTube1 *self, GHashTable *parameters, guint access_control, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { SalutTubeDBus *tube = SALUT_TUBE_DBUS (self); SalutTubeDBusPrivate *priv = SALUT_TUBE_DBUS_GET_PRIVATE (tube); @@ -1581,7 +1581,7 @@ salut_tube_dbus_offer_async (TpSvcChannelTypeDBusTube1 *self, static void salut_tube_dbus_accept_async (TpSvcChannelTypeDBusTube1 *self, guint access_control, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { SalutTubeDBus *tube = SALUT_TUBE_DBUS (self); SalutTubeDBusPrivate *priv = SALUT_TUBE_DBUS_GET_PRIVATE (tube); diff --git a/src/tube-stream.c b/src/tube-stream.c index 3ce3aa78..682cfc03 100644 --- a/src/tube-stream.c +++ b/src/tube-stream.c @@ -2061,7 +2061,7 @@ salut_tube_stream_offer_async (TpSvcChannelTypeStreamTube1 *iface, const GValue *address, guint access_control, GHashTable *parameters, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { SalutTubeStream *self = SALUT_TUBE_STREAM (iface); SalutTubeStreamPrivate *priv = SALUT_TUBE_STREAM_GET_PRIVATE (self); @@ -2117,7 +2117,7 @@ salut_tube_stream_accept_async (TpSvcChannelTypeStreamTube1 *iface, guint address_type, guint access_control, const GValue *access_control_param, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { SalutTubeStream *self = SALUT_TUBE_STREAM (iface); SalutTubeStreamPrivate *priv = SALUT_TUBE_STREAM_GET_PRIVATE (self); |