diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-18 19:27:09 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-27 15:40:39 +0000 |
commit | 8d1cfc63fb130c145d9727b617ea3210d0d31f1d (patch) | |
tree | 7bba5983781cd7ee1f152ef0a7497c63155f3301 | |
parent | ba2378a6686a8400dfce6a9c7af2e86f34a50458 (diff) |
replace DBusGMethodInvocation with GDBusMethodInvocation
-rw-r--r-- | src/mcd-account-addressing.c | 2 | ||||
-rw-r--r-- | src/mcd-account-manager.c | 4 | ||||
-rw-r--r-- | src/mcd-account.c | 10 | ||||
-rw-r--r-- | src/mcd-channel-priv.h | 2 | ||||
-rw-r--r-- | src/mcd-dbusprop.c | 8 | ||||
-rw-r--r-- | src/mcd-dbusprop.h | 6 | ||||
-rw-r--r-- | src/mcd-dispatch-operation.c | 12 | ||||
-rw-r--r-- | src/mcd-dispatcher.c | 28 | ||||
-rw-r--r-- | src/request.c | 6 | ||||
-rw-r--r-- | src/request.h | 2 |
10 files changed, 40 insertions, 40 deletions
diff --git a/src/mcd-account-addressing.c b/src/mcd-account-addressing.c index 7d2355b7..282c65cb 100644 --- a/src/mcd-account-addressing.c +++ b/src/mcd-account-addressing.c @@ -35,7 +35,7 @@ static void addressing_set_uri_scheme_association (TpSvcAccountInterfaceAddressing1 *iface, const gchar *uri_scheme, gboolean association, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { McdAccount *self = MCD_ACCOUNT (iface); const gchar *account = mcd_account_get_unique_name (self); diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c index d11659aa..8330bcd4 100644 --- a/src/mcd-account-manager.c +++ b/src/mcd-account-manager.c @@ -941,7 +941,7 @@ static void create_account_cb (McdAccountManager *account_manager, McdAccount *account, const GError *error, gpointer user_data) { - DBusGMethodInvocation *context = user_data; + GDBusMethodInvocation *context = user_data; const gchar *object_path; if (G_UNLIKELY (error)) @@ -962,7 +962,7 @@ account_manager_create_account (TpSvcAccountManager *self, const gchar *display_name, GHashTable *parameters, GHashTable *properties, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { _mcd_account_manager_create_account (MCD_ACCOUNT_MANAGER (self), manager, protocol, display_name, diff --git a/src/mcd-account.c b/src/mcd-account.c index 75e408d1..04ef3355 100644 --- a/src/mcd-account.c +++ b/src/mcd-account.c @@ -2142,7 +2142,7 @@ mc_param_type (const TpConnectionManagerParam *param, typedef struct { McdAccount *self; - DBusGMethodInvocation *context; + GDBusMethodInvocation *context; } RemoveMethodData; static void @@ -2168,7 +2168,7 @@ account_remove_delete_cb (GObject *source, } static void -account_remove (TpSvcAccount *svc, DBusGMethodInvocation *context) +account_remove (TpSvcAccount *svc, GDBusMethodInvocation *context) { McdAccount *self = MCD_ACCOUNT (svc); RemoveMethodData *data; @@ -2628,7 +2628,7 @@ account_update_parameters_cb (McdAccount *account, GPtrArray *not_yet, const GError *error, gpointer user_data) { McdAccountPrivate *priv = account->priv; - DBusGMethodInvocation *context = (DBusGMethodInvocation *) user_data; + GDBusMethodInvocation *context = (GDBusMethodInvocation *) user_data; const gchar *account_name = mcd_account_get_unique_name (account); GHashTable *params; GValue value = G_VALUE_INIT; @@ -2659,7 +2659,7 @@ account_update_parameters_cb (McdAccount *account, GPtrArray *not_yet, static void account_update_parameters (TpSvcAccount *self, GHashTable *set, - const gchar **unset, DBusGMethodInvocation *context) + const gchar **unset, GDBusMethodInvocation *context) { McdAccount *account = MCD_ACCOUNT (self); McdAccountPrivate *priv = account->priv; @@ -2704,7 +2704,7 @@ _mcd_account_reconnect (McdAccount *self, static void account_reconnect (TpSvcAccount *service, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { McdAccount *self = MCD_ACCOUNT (service); diff --git a/src/mcd-channel-priv.h b/src/mcd-channel-priv.h index 9e045837..71b62314 100644 --- a/src/mcd-channel-priv.h +++ b/src/mcd-channel-priv.h @@ -58,7 +58,7 @@ G_GNUC_INTERNAL gboolean _mcd_channel_get_request_use_existing (McdChannel *channel); G_GNUC_INTERNAL void _mcd_channel_request_proceed (McdChannel *self, - DBusGMethodInvocation *context); + GDBusMethodInvocation *context); G_GNUC_INTERNAL void _mcd_channel_copy_details (McdChannel *channel, McdChannel *source); diff --git a/src/mcd-dbusprop.c b/src/mcd-dbusprop.c index f0d64e58..567b591a 100644 --- a/src/mcd-dbusprop.c +++ b/src/mcd-dbusprop.c @@ -190,7 +190,7 @@ dbusprop_set (TpSvcDBusProperties *self, const gchar *interface_name, const gchar *property_name, const GValue *value, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { GError *error = NULL; @@ -235,7 +235,7 @@ void dbusprop_get (TpSvcDBusProperties *self, const gchar *interface_name, const gchar *property_name, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { GValue value = G_VALUE_INIT; GError *error = NULL; @@ -259,7 +259,7 @@ dbusprop_get (TpSvcDBusProperties *self, typedef struct { TpSvcDBusProperties *self; - DBusGMethodInvocation *context; + GDBusMethodInvocation *context; GHashTable *properties; const McdDBusProp *property; } GetAllData; @@ -309,7 +309,7 @@ typedef struct void dbusprop_get_all (TpSvcDBusProperties *self, const gchar *interface_name, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { const McdDBusProp *prop_array; GError *error = NULL; diff --git a/src/mcd-dbusprop.h b/src/mcd-dbusprop.h index 509541a6..d7c14273 100644 --- a/src/mcd-dbusprop.h +++ b/src/mcd-dbusprop.h @@ -131,16 +131,16 @@ void dbusprop_set (TpSvcDBusProperties *self, const gchar *interface_name, const gchar *property_name, const GValue *value, - DBusGMethodInvocation *context); + GDBusMethodInvocation *context); void dbusprop_get (TpSvcDBusProperties *self, const gchar *interface_name, const gchar *property_name, - DBusGMethodInvocation *context); + GDBusMethodInvocation *context); void dbusprop_get_all (TpSvcDBusProperties *self, const gchar *interface_name, - DBusGMethodInvocation *context); + GDBusMethodInvocation *context); void mcd_dbus_get_interfaces (TpSvcDBusProperties *self, const gchar *name, diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c index aee28469..f8674e23 100644 --- a/src/mcd-dispatch-operation.c +++ b/src/mcd-dispatch-operation.c @@ -81,12 +81,12 @@ typedef struct { * cases, to signify "any handler will do" */ gchar *client_bus_name; /* NULL unless type is CLAIM or HANDLE_WITH */ - DBusGMethodInvocation *context; + GDBusMethodInvocation *context; } Approval; static Approval * approval_new_handle_with (const gchar *client_bus_name, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { Approval *approval = g_slice_new0 (Approval); @@ -101,7 +101,7 @@ approval_new_handle_with (const gchar *client_bus_name, } static Approval * -approval_new_claim (DBusGMethodInvocation *context) +approval_new_claim (GDBusMethodInvocation *context) { Approval *approval = g_slice_new0 (Approval); @@ -932,7 +932,7 @@ static void dispatch_operation_handle_with (TpSvcChannelDispatchOperation *cdo, const gchar *handler_name, gint64 user_action_timestamp, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { GError *error = NULL; McdDispatchOperation *self = MCD_DISPATCH_OPERATION (cdo); @@ -955,7 +955,7 @@ dispatch_operation_handle_with (TpSvcChannelDispatchOperation *cdo, typedef struct { McdDispatchOperation *self; - DBusGMethodInvocation *context; + GDBusMethodInvocation *context; gsize handler_suitable_pending; } ClaimAttempt; @@ -1000,7 +1000,7 @@ claim_attempt_suitability_cb (GObject *source, static void dispatch_operation_claim (TpSvcChannelDispatchOperation *cdo, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { McdDispatchOperation *self = MCD_DISPATCH_OPERATION (cdo); ClaimAttempt *claim_attempt; diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c index 64c359d4..00e5a272 100644 --- a/src/mcd-dispatcher.c +++ b/src/mcd-dispatcher.c @@ -1221,7 +1221,7 @@ dispatcher_request_channel (McdDispatcher *self, gint64 user_action_time, const gchar *preferred_handler, GHashTable *request_metadata, - DBusGMethodInvocation *context, + GDBusMethodInvocation *context, gboolean ensure) { McdAccountManager *am; @@ -1304,7 +1304,7 @@ dispatcher_create_channel (TpSvcChannelDispatcher *iface, gint64 user_action_time, const gchar *preferred_handler, GHashTable *hints, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { dispatcher_request_channel (MCD_DISPATCHER (iface), account_path, @@ -1323,7 +1323,7 @@ dispatcher_ensure_channel (TpSvcChannelDispatcher *iface, gint64 user_action_time, const gchar *preferred_handler, GHashTable *hints, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { dispatcher_request_channel (MCD_DISPATCHER (iface), account_path, @@ -1403,7 +1403,7 @@ typedef struct guint flags; guint tries; gboolean close_after; - DBusGMethodInvocation *dbus_context; + GDBusMethodInvocation *dbus_context; } MessageContext; static MessageContext * @@ -1449,7 +1449,7 @@ message_context_return_error (MessageContext *context, const GError *error) static void message_context_set_return_context (MessageContext *context, - DBusGMethodInvocation *dbus_context) + GDBusMethodInvocation *dbus_context) { context->dbus_context = dbus_context; } @@ -1486,7 +1486,7 @@ send_message_submitted (TpChannel *proxy, GObject *weak) { MessageContext *message = data; - DBusGMethodInvocation *context = message->dbus_context; + GDBusMethodInvocation *context = message->dbus_context; McdChannel *channel = MCD_CHANNEL (weak); McdRequest *request = _mcd_channel_get_request (channel); gboolean close_after = message->close_after; @@ -1510,7 +1510,7 @@ send_message_submitted (TpChannel *proxy, _mcd_channel_close (channel); } -static void messages_send_message_start (DBusGMethodInvocation *context, +static void messages_send_message_start (GDBusMethodInvocation *context, MessageContext *message); static void @@ -1561,7 +1561,7 @@ send_message_got_channel (McdRequest *request, } static void -messages_send_message_start (DBusGMethodInvocation *dbus_context, +messages_send_message_start (GDBusMethodInvocation *dbus_context, MessageContext *message) { McdAccountManager *am; @@ -1659,7 +1659,7 @@ messages_send_message (TpSvcChannelDispatcherInterfaceMessages1 *iface, const gchar *target_id, const GPtrArray *payload, guint flags, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { McdDispatcher *self= MCD_DISPATCHER (iface); MessageContext *message = @@ -1681,7 +1681,7 @@ typedef struct { McdDispatcher *self; gint64 user_action_time; - DBusGMethodInvocation *context; + GDBusMethodInvocation *context; /* List of owned ChannelToDelegate */ GList *channels; /* array of owned channel path */ @@ -1737,7 +1737,7 @@ free_not_delegated_error (gpointer data) static DelegateChannelsCtx * delegate_channels_ctx_new (McdDispatcher *self, gint64 user_action_time, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { DelegateChannelsCtx *ctx = g_slice_new0 (DelegateChannelsCtx); @@ -1922,7 +1922,7 @@ dispatcher_delegate_channels ( const GPtrArray *channels, gint64 user_action_time, const gchar *preferred_handler, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { McdDispatcher *self = (McdDispatcher *) iface; GError *error = NULL; @@ -2029,7 +2029,7 @@ present_handle_channel_cb (TpClient *client, gpointer user_data, GObject *weak_object) { - DBusGMethodInvocation *context = user_data; + GDBusMethodInvocation *context = user_data; McdChannel *mcd_channel = MCD_CHANNEL (weak_object); /* Whether presenting the channel succeeded or failed, the @@ -2052,7 +2052,7 @@ dispatcher_present_channel ( TpSvcChannelDispatcher *iface, const gchar *channel_path, gint64 user_action_time, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { McdDispatcher *self = (McdDispatcher *) iface; McdAccountManager *am; diff --git a/src/request.c b/src/request.c index 01c8a406..8786089b 100644 --- a/src/request.c +++ b/src/request.c @@ -677,7 +677,7 @@ _queue_blocked_requests (McdRequest *self) void _mcd_request_proceed (McdRequest *self, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { McdConnection *connection = NULL; McdPluginRequest *plugin_api = NULL; @@ -912,7 +912,7 @@ _mcd_request_set_uncancellable (McdRequest *self) static void channel_request_cancel (TpSvcChannelRequest *iface, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { McdRequest *self = MCD_REQUEST (iface); GError *error = NULL; @@ -930,7 +930,7 @@ channel_request_cancel (TpSvcChannelRequest *iface, static void channel_request_proceed (TpSvcChannelRequest *iface, - DBusGMethodInvocation *context) + GDBusMethodInvocation *context) { McdRequest *self = MCD_REQUEST (iface); diff --git a/src/request.h b/src/request.h index 03a456b9..3ef38e9e 100644 --- a/src/request.h +++ b/src/request.h @@ -75,7 +75,7 @@ G_GNUC_INTERNAL GHashTable *_mcd_request_dup_immutable_properties ( McdRequest *self); G_GNUC_INTERNAL void _mcd_request_proceed (McdRequest *self, - DBusGMethodInvocation *context); + GDBusMethodInvocation *context); G_GNUC_INTERNAL void _mcd_request_start_delay (McdRequest *self); G_GNUC_INTERNAL void _mcd_request_end_delay (McdRequest *self); |