[gnome-online-accounts] exchange: Style fixes
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-online-accounts] exchange: Style fixes
- Date: Mon, 9 Jan 2017 14:00:25 +0000 (UTC)
commit 162ddd9ba92c377d8015ed7bb1fb46c0a7ace0a3
Author: Debarshi Ray <debarshir gnome org>
Date: Mon Jan 9 14:36:23 2017 +0100
exchange: Style fixes
Don't use a separate line to initialize variables.
src/goabackend/goaexchangeprovider.c | 65 ++++++++++------------------------
1 files changed, 19 insertions(+), 46 deletions(-)
---
diff --git a/src/goabackend/goaexchangeprovider.c b/src/goabackend/goaexchangeprovider.c
index 5a22a5f..68f6d04 100644
--- a/src/goabackend/goaexchangeprovider.c
+++ b/src/goabackend/goaexchangeprovider.c
@@ -105,20 +105,14 @@ build_object (GoaProvider *provider,
gboolean just_added,
GError **error)
{
- GoaAccount *account;
- GoaExchange *exchange;
- GoaMail *mail;
- GoaPasswordBased *password_based;
+ GoaAccount *account = NULL;
+ GoaExchange *exchange = NULL;
+ GoaMail *mail = NULL;
+ GoaPasswordBased *password_based = NULL;
gboolean calendar_enabled;
gboolean contacts_enabled;
gboolean mail_enabled;
- gboolean ret;
-
- account = NULL;
- exchange = NULL;
- mail = NULL;
- password_based = NULL;
- ret = FALSE;
+ gboolean ret = FALSE;
/* Chain up */
if (!GOA_PROVIDER_CLASS (goa_exchange_provider_parent_class)->build_object (provider,
@@ -232,20 +226,14 @@ ensure_credentials_sync (GoaProvider *provider,
GError **error)
{
GoaAccount *account;
- GoaEwsClient *ews_client;
+ GoaEwsClient *ews_client = NULL;
GoaExchange *exchange;
gboolean accept_ssl_errors;
- gboolean ret;
+ gboolean ret = FALSE;
const gchar *email_address;
const gchar *server;
- gchar *username;
- gchar *password;
-
- ews_client = NULL;
- password = NULL;
- username = NULL;
-
- ret = FALSE;
+ gchar *username = NULL;
+ gchar *password = NULL;
if (!goa_utils_get_credentials (provider, object, "password", &username, &password, cancellable, error))
{
@@ -363,16 +351,11 @@ static void
on_email_address_or_password_changed (GtkEditable *editable, gpointer user_data)
{
AddAccountData *data = user_data;
- gboolean can_add;
+ gboolean can_add = FALSE;
const gchar *email;
- gchar *domain;
- gchar *url;
- gchar *username;
-
- can_add = FALSE;
- domain = NULL;
- url = NULL;
- username = NULL;
+ gchar *domain = NULL;
+ gchar *url = NULL;
+ gchar *username = NULL;
email = gtk_entry_get_text (GTK_ENTRY (data->email_address));
if (!goa_utils_parse_email_address (email, &username, &domain))
@@ -547,9 +530,9 @@ add_account (GoaProvider *provider,
AddAccountData data;
GVariantBuilder credentials;
GVariantBuilder details;
- GoaEwsClient *ews_client;
- GoaObject *ret;
- gboolean accept_ssl_errors;
+ GoaEwsClient *ews_client = NULL;
+ GoaObject *ret = NULL;
+ gboolean accept_ssl_errors = FALSE;
const gchar *email_address;
const gchar *server;
const gchar *password;
@@ -557,11 +540,6 @@ add_account (GoaProvider *provider,
const gchar *provider_type;
gint response;
- ews_client = NULL;
- accept_ssl_errors = FALSE;
-
- ret = NULL;
-
memset (&data, 0, sizeof (AddAccountData));
data.cancellable = g_cancellable_new ();
data.loop = g_main_loop_new (NULL, FALSE);
@@ -716,12 +694,12 @@ refresh_account (GoaProvider *provider,
AddAccountData data;
GVariantBuilder builder;
GoaAccount *account;
- GoaEwsClient *ews_client;
+ GoaEwsClient *ews_client = NULL;
GoaExchange *exchange;
GtkWidget *dialog;
GtkWidget *vbox;
gboolean accept_ssl_errors;
- gboolean ret;
+ gboolean ret = FALSE;
const gchar *email_address;
const gchar *server;
const gchar *password;
@@ -734,9 +712,6 @@ refresh_account (GoaProvider *provider,
g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- ews_client = NULL;
- ret = FALSE;
-
dialog = gtk_dialog_new_with_buttons (NULL,
parent,
GTK_DIALOG_MODAL
@@ -895,12 +870,10 @@ on_handle_get_password (GoaPasswordBased *interface,
const gchar *account_id;
const gchar *method_name;
const gchar *provider_type;
- gchar *password;
+ gchar *password = NULL;
/* TODO: maybe log what app is requesting access */
- password = NULL;
-
object = GOA_OBJECT (g_dbus_interface_get_object (G_DBUS_INTERFACE (interface)));
account = goa_object_peek_account (object);
account_id = goa_account_get_id (account);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]