From f59681796df8fe0138a1754abbe8ec781bc1535e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 1 Jul 2011 00:07:26 -0400 Subject: Coding style and whitespace cleanup. --- capplet/settings/mail-account-view.c | 9 +++------ capplet/settings/mail-capplet-shell.c | 14 +++++++++----- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'capplet/settings') diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c index 0290cd739e..d1c5246702 100644 --- a/capplet/settings/mail-account-view.c +++ b/capplet/settings/mail-account-view.c @@ -413,20 +413,17 @@ setup_google_accounts (MailAccountView *mav) sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE); sources = e_source_group_peek_sources (sgrp); - for (; sources; sources = sources->next) - { + for (; sources; sources = sources->next) { ESource *existing = (ESource*) sources->data; if (!g_strcmp0 (e_source_peek_relative_uri (existing), - mav->priv->username)) - { + mav->priv->username)) { source_already_exists = TRUE; break; } } - if (!source_already_exists) - { + if (!source_already_exists) { ESource *abook; gchar *rel_uri; diff --git a/capplet/settings/mail-capplet-shell.c b/capplet/settings/mail-capplet-shell.c index ebcb5cd355..75e2e11fff 100644 --- a/capplet/settings/mail-capplet-shell.c +++ b/capplet/settings/mail-capplet-shell.c @@ -313,10 +313,13 @@ setup_abooks (void) ESource *personal_source = NULL; GError *error = NULL; - if (!e_book_client_get_sources (&list, &error)) { - g_debug ("%s: Unable to get books: %s", G_STRFUNC, error ? error->message : "Unknown error"); - if (error) - g_error_free (error); + e_book_client_get_sources (&list, &error); + + if (error != NULL) { + g_warning ( + "%s: Unable to get books: %s", + G_STRFUNC, error->message); + g_error_free (error); return; } @@ -326,7 +329,8 @@ setup_abooks (void) GSList *g; gchar *base_dir, *base_uri; - base_dir = g_build_filename (e_get_user_data_dir (), "addressbook", "local", NULL); + base_dir = g_build_filename ( + e_get_user_data_dir (), "addressbook", "local", NULL); base_uri = g_filename_to_uri (base_dir, NULL, NULL); for (g = groups; g; g = g->next) { -- cgit v1.2.3