diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-01-31 01:20:16 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-01-31 01:45:55 +0800 |
| commit | 763081aa862908e845bc780b784d939a07abd508 (patch) | |
| tree | 1a060b3cc1ae28e915348939cbbcdd28416a13b5 /e-util | |
| parent | 0ff254b3a8946244b645f2ea74316926aa109ab6 (diff) | |
| download | gsoc2013-evolution-763081aa862908e845bc780b784d939a07abd508.tar gsoc2013-evolution-763081aa862908e845bc780b784d939a07abd508.tar.gz gsoc2013-evolution-763081aa862908e845bc780b784d939a07abd508.tar.bz2 gsoc2013-evolution-763081aa862908e845bc780b784d939a07abd508.tar.lz gsoc2013-evolution-763081aa862908e845bc780b784d939a07abd508.tar.xz gsoc2013-evolution-763081aa862908e845bc780b784d939a07abd508.tar.zst gsoc2013-evolution-763081aa862908e845bc780b784d939a07abd508.zip | |
Fix up error handling around e_book/cal_client_connect_finish().
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/e-name-selector-dialog.c | 9 | ||||
| -rw-r--r-- | e-util/e-name-selector-entry.c | 2 | ||||
| -rw-r--r-- | e-util/e-name-selector.c | 5 |
3 files changed, 4 insertions, 12 deletions
diff --git a/e-util/e-name-selector-dialog.c b/e-util/e-name-selector-dialog.c index 36b426b0f5..fd72818612 100644 --- a/e-util/e-name-selector-dialog.c +++ b/e-util/e-name-selector-dialog.c @@ -1157,14 +1157,9 @@ book_client_connect_cb (GObject *source_object, } if (error != NULL) { - gchar *message; - - message = g_strdup_printf ( - _("Error loading address book: %s"), error->message); gtk_label_set_text ( - name_selector_dialog->priv->status_label, message); - g_free (message); - + name_selector_dialog->priv->status_label, + error->message); g_error_free (error); goto exit; } diff --git a/e-util/e-name-selector-entry.c b/e-util/e-name-selector-entry.c index 58c7b391fd..25b018326a 100644 --- a/e-util/e-name-selector-entry.c +++ b/e-util/e-name-selector-entry.c @@ -2227,7 +2227,7 @@ book_client_connect_cb (GObject *source_object, } if (error != NULL) { - g_warning ("%s", error->message); + g_warning ("%s: %s", G_STRFUNC, error->message); g_error_free (error); goto exit; } diff --git a/e-util/e-name-selector.c b/e-util/e-name-selector.c index 66d93512d0..21cd93cc1a 100644 --- a/e-util/e-name-selector.c +++ b/e-util/e-name-selector.c @@ -95,7 +95,6 @@ name_selector_book_client_connect_cb (GObject *source_object, gpointer user_data) { ENameSelector *name_selector = user_data; - ESource *source = E_SOURCE (source_object); EBookClient *book_client; EClient *client; GArray *sections; @@ -115,9 +114,7 @@ name_selector_book_client_connect_cb (GObject *source_object, && !g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_OFFLINE_UNAVAILABLE) && !g_error_matches (error, E_CLIENT_ERROR, E_CLIENT_ERROR_CANCELLED) && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) - g_warning ( - "ENameSelector: Could not load \"%s\": %s", - e_source_get_display_name (source), error->message); + g_warning ("%s: %s", G_STRFUNC, error->message); g_error_free (error); goto exit; } |