From 0a4fe565bae98f3c0a497b0c02e60e7241663e75 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 21 May 2014 10:49:37 +0200 Subject: [PATCH 4/9] account-request: remove useless 'priv' variable https://bugs.freedesktop.org/show_bug.cgi?id=79006 --- telepathy-glib/account-request.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/telepathy-glib/account-request.c b/telepathy-glib/account-request.c index 1e349fe..dccaa36 100644 --- a/telepathy-glib/account-request.c +++ b/telepathy-glib/account-request.c @@ -1349,13 +1349,9 @@ tp_account_request_create_account_async (TpAccountRequest *self, GAsyncReadyCallback callback, gpointer user_data) { - TpAccountRequestPrivate *priv = self->priv; - g_return_if_fail (TP_IS_ACCOUNT_REQUEST (self)); - priv = self->priv; - - if (priv->result != NULL) + if (self->priv->result != NULL) { g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data, @@ -1365,7 +1361,7 @@ tp_account_request_create_account_async (TpAccountRequest *self, return; } - if (priv->created) + if (self->priv->created) { g_simple_async_report_error_in_idle (G_OBJECT (self), callback, user_data, @@ -1374,12 +1370,12 @@ tp_account_request_create_account_async (TpAccountRequest *self, return; } - priv->result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - tp_account_request_create_account_async); + self->priv->result = g_simple_async_result_new (G_OBJECT (self), callback, + user_data, tp_account_request_create_account_async); - tp_cli_account_manager_call_create_account (priv->account_manager, - -1, priv->cm_name, priv->proto_name, priv->display_name, - priv->parameters, priv->properties, + tp_cli_account_manager_call_create_account (self->priv->account_manager, + -1, self->priv->cm_name, self->priv->proto_name, self->priv->display_name, + self->priv->parameters, self->priv->properties, tp_account_request_create_account_cb, NULL, NULL, G_OBJECT (self)); } -- 1.9.0