diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-07-01 12:07:26 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-08-13 23:27:51 +0800 |
| commit | f59681796df8fe0138a1754abbe8ec781bc1535e (patch) | |
| tree | 0ced0c119ffed095713d7f64732686df9b2d9152 /capplet/settings | |
| parent | bf4a1a13e3295deefc4031a446627ff9b1c95c7a (diff) | |
| download | gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar.gz gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar.bz2 gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar.lz gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar.xz gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.tar.zst gsoc2013-evolution-f59681796df8fe0138a1754abbe8ec781bc1535e.zip | |
Coding style and whitespace cleanup.
Diffstat (limited to 'capplet/settings')
| -rw-r--r-- | capplet/settings/mail-account-view.c | 9 | ||||
| -rw-r--r-- | capplet/settings/mail-capplet-shell.c | 14 |
2 files changed, 12 insertions, 11 deletions
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) { |