diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-24 18:20:10 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-24 18:20:10 +0000 |
commit | 059d1bcd4a6a9bc5cbd6066c2d02cdc095a2bb0c (patch) | |
tree | 0d1682d04eeca9430967beebb5016d0e1278fdd7 | |
parent | b0c4579e37b4d45f46d0947b3d7f61f55cc9473b (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/idle-connection.c | 10 | ||||
-rw-r--r-- | src/idle-contact-info.c | 6 | ||||
-rw-r--r-- | src/idle-im-channel.c | 2 | ||||
-rw-r--r-- | src/idle-muc-channel.c | 10 | ||||
-rw-r--r-- | src/idle-roomlist-channel.c | 6 | ||||
-rw-r--r-- | src/tls-certificate.c | 4 |
6 files changed, 19 insertions, 19 deletions
diff --git a/src/idle-connection.c b/src/idle-connection.c index be913d6..4130fd7 100644 --- a/src/idle-connection.c +++ b/src/idle-connection.c @@ -1337,7 +1337,7 @@ conn_aliasing_fill_contact_attributes (IdleConnection *self, return FALSE; } -static void idle_connection_request_aliases(TpSvcConnectionInterfaceAliasing1 *iface, const GArray *handles, DBusGMethodInvocation *context) { +static void idle_connection_request_aliases(TpSvcConnectionInterfaceAliasing1 *iface, const GArray *handles, GDBusMethodInvocation *context) { IdleConnection *self = IDLE_CONNECTION (iface); TpHandleRepoIface *repo = tp_base_connection_get_handles(TP_BASE_CONNECTION(iface), TP_ENTITY_TYPE_CONTACT); GError *error = NULL; @@ -1360,7 +1360,7 @@ static void idle_connection_request_aliases(TpSvcConnectionInterfaceAliasing1 *i g_free(aliases); } -static gboolean _send_rename_request(IdleConnection *obj, const gchar *nick, DBusGMethodInvocation *context) { +static gboolean _send_rename_request(IdleConnection *obj, const gchar *nick, GDBusMethodInvocation *context) { TpHandleRepoIface *handles = tp_base_connection_get_handles(TP_BASE_CONNECTION(obj), TP_ENTITY_TYPE_CONTACT); TpHandle handle = tp_handle_ensure(handles, nick, NULL, NULL); gchar msg[IRC_MSG_MAXLEN + 1]; @@ -1383,7 +1383,7 @@ static gboolean _send_rename_request(IdleConnection *obj, const gchar *nick, DBu static void idle_connection_request_rename (TpSvcConnectionInterfaceRenaming1 *iface, const gchar *nick, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { IdleConnection *conn = IDLE_CONNECTION(iface); @@ -1391,7 +1391,7 @@ idle_connection_request_rename (TpSvcConnectionInterfaceRenaming1 *iface, tp_svc_connection_interface_renaming1_return_from_request_rename(context); } -static void idle_connection_set_aliases(TpSvcConnectionInterfaceAliasing1 *iface, GHashTable *aliases, DBusGMethodInvocation *context) { +static void idle_connection_set_aliases(TpSvcConnectionInterfaceAliasing1 *iface, GHashTable *aliases, GDBusMethodInvocation *context) { IdleConnection *conn = IDLE_CONNECTION(iface); const gchar *requested_alias = g_hash_table_lookup(aliases, GUINT_TO_POINTER(tp_base_connection_get_self_handle (TP_BASE_CONNECTION (conn)))); @@ -1591,7 +1591,7 @@ check_irc_command (IdleConnection *self, static void idle_connection_irc_command_send (IdleSvcConnectionInterfaceIRCCommand1 *iface, const gchar *command, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { IdleConnection *self = IDLE_CONNECTION(iface); GError *error = NULL; diff --git a/src/idle-contact-info.c b/src/idle-contact-info.c index b8963fe..cdafc99 100644 --- a/src/idle-contact-info.c +++ b/src/idle-contact-info.c @@ -37,7 +37,7 @@ struct _ContactInfoRequest { gboolean is_reg_nick; gboolean is_secure; GPtrArray *contact_info; - DBusGMethodInvocation *context; + GDBusMethodInvocation *context; }; /* @@ -96,7 +96,7 @@ static void _dequeue_request_contact_info(IdleConnection *conn) { _send_request_contact_info(conn, request); } -static void _queue_request_contact_info(IdleConnection *conn, guint handle, const gchar *nick, DBusGMethodInvocation *context) { +static void _queue_request_contact_info(IdleConnection *conn, guint handle, const gchar *nick, GDBusMethodInvocation *context) { ContactInfoRequest *request; request = g_slice_new0(ContactInfoRequest); @@ -123,7 +123,7 @@ static void _return_from_request_contact_info(IdleConnection *conn) { _dequeue_request_contact_info(conn); } -static void idle_connection_request_contact_info(TpSvcConnectionInterfaceContactInfo1 *iface, guint contact, DBusGMethodInvocation *context) { +static void idle_connection_request_contact_info(TpSvcConnectionInterfaceContactInfo1 *iface, guint contact, GDBusMethodInvocation *context) { IdleConnection *self = IDLE_CONNECTION(iface); TpBaseConnection *base = TP_BASE_CONNECTION(self); TpHandleRepoIface *contact_handles = tp_base_connection_get_handles(base, TP_ENTITY_TYPE_CONTACT); diff --git a/src/idle-im-channel.c b/src/idle-im-channel.c index c8bd752..40df806 100644 --- a/src/idle-im-channel.c +++ b/src/idle-im-channel.c @@ -203,7 +203,7 @@ idle_im_channel_send ( static void idle_im_channel_destroy ( TpSvcChannelInterfaceDestroyable1 *iface, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { TpBaseChannel *chan = TP_BASE_CHANNEL (iface); GObject *obj = (GObject *) chan; diff --git a/src/idle-muc-channel.c b/src/idle-muc-channel.c index a3abe1f..4fc2091 100644 --- a/src/idle-muc-channel.c +++ b/src/idle-muc-channel.c @@ -155,7 +155,7 @@ struct _IdleMUCChannelPrivate { guint password_flags; - DBusGMethodInvocation *passwd_ctx; + GDBusMethodInvocation *passwd_ctx; /* NAMEREPLY MembersChanged aggregation */ TpHandleSet *namereply_set; @@ -1370,7 +1370,7 @@ idle_muc_channel_close ( static void idle_muc_channel_destroy ( TpSvcChannelInterfaceDestroyable1 *object, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { TpBaseChannel *base = TP_BASE_CHANNEL (object); IdleMUCChannel *self = IDLE_MUC_CHANNEL (object); @@ -1389,7 +1389,7 @@ idle_muc_channel_destroy ( } -static void idle_muc_channel_get_password_flags (TpSvcChannelInterfacePassword1 *iface, DBusGMethodInvocation *context) { +static void idle_muc_channel_get_password_flags (TpSvcChannelInterfacePassword1 *iface, GDBusMethodInvocation *context) { IdleMUCChannel *obj = IDLE_MUC_CHANNEL(iface); IdleMUCChannelPrivate *priv; @@ -1402,7 +1402,7 @@ static void idle_muc_channel_get_password_flags (TpSvcChannelInterfacePassword1 } -static void idle_muc_channel_provide_password (TpSvcChannelInterfacePassword1 *iface, const gchar * password, DBusGMethodInvocation *context) { +static void idle_muc_channel_provide_password (TpSvcChannelInterfacePassword1 *iface, const gchar * password, GDBusMethodInvocation *context) { IdleMUCChannel *obj = IDLE_MUC_CHANNEL(iface); IdleMUCChannelPrivate *priv; @@ -1456,7 +1456,7 @@ static void idle_muc_channel_set_subject ( TpSvcChannelInterfaceSubject1 *iface, const gchar *subject, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { IdleMUCChannel *self = IDLE_MUC_CHANNEL (iface); IdleMUCChannelPrivate *priv = self->priv; diff --git a/src/idle-roomlist-channel.c b/src/idle-roomlist-channel.c index 5c08a2f..e69bd8d 100644 --- a/src/idle-roomlist-channel.c +++ b/src/idle-roomlist-channel.c @@ -226,7 +226,7 @@ idle_roomlist_channel_close (TpBaseChannel *channel) */ static void idle_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList1 *iface, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { IdleRoomlistChannel *self = IDLE_ROOMLIST_CHANNEL (iface); IdleRoomlistChannelPrivate *priv = self->priv;; @@ -244,7 +244,7 @@ idle_roomlist_channel_get_listing_rooms (TpSvcChannelTypeRoomList1 *iface, */ static void idle_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList1 *iface, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { IdleRoomlistChannel *self = IDLE_ROOMLIST_CHANNEL (iface); IdleRoomlistChannelPrivate *priv = self->priv; @@ -265,7 +265,7 @@ idle_roomlist_channel_list_rooms (TpSvcChannelTypeRoomList1 *iface, */ static void idle_roomlist_channel_stop_listing (TpSvcChannelTypeRoomList1 *iface, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { IdleRoomlistChannel *self = IDLE_ROOMLIST_CHANNEL (iface); GError error = { TP_ERROR, TP_ERROR_NOT_IMPLEMENTED, "Can't stop listing!" }; diff --git a/src/tls-certificate.c b/src/tls-certificate.c index 25226cf..17a3b50 100644 --- a/src/tls-certificate.c +++ b/src/tls-certificate.c @@ -256,7 +256,7 @@ idle_tls_certificate_class_init (IdleTLSCertificateClass *klass) static void idle_tls_certificate_accept (TpSvcAuthenticationTLSCertificate *cert, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { IdleTLSCertificate *self = IDLE_TLS_CERTIFICATE (cert); @@ -285,7 +285,7 @@ idle_tls_certificate_accept (TpSvcAuthenticationTLSCertificate *cert, static void idle_tls_certificate_reject (TpSvcAuthenticationTLSCertificate *cert, const GPtrArray *rejections, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { IdleTLSCertificate *self = IDLE_TLS_CERTIFICATE (cert); |