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 /modules/calendar | |
| 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 'modules/calendar')
| -rw-r--r-- | modules/calendar/e-cal-attachment-handler.c | 12 | ||||
| -rw-r--r-- | modules/calendar/e-cal-shell-backend.c | 5 | ||||
| -rw-r--r-- | modules/calendar/e-memo-shell-backend.c | 5 | ||||
| -rw-r--r-- | modules/calendar/e-task-shell-backend.c | 5 |
4 files changed, 5 insertions, 22 deletions
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c index d16f4a6bfc..539a5ba3a4 100644 --- a/modules/calendar/e-cal-attachment-handler.c +++ b/modules/calendar/e-cal-attachment-handler.c @@ -169,7 +169,6 @@ attachment_handler_import_event (GObject *source_object, GAsyncResult *result, gpointer user_data) { - ESource *source = E_SOURCE (source_object); EAttachment *attachment = user_data; EClient *client; icalcomponent *component; @@ -185,10 +184,7 @@ attachment_handler_import_event (GObject *source_object, ((client == NULL) && (error != NULL))); if (error != NULL) { - g_warning ( - "%s: Failed to open '%s': %s", - G_STRFUNC, e_source_get_display_name (source), - error->message); + g_warning ("%s: %s", G_STRFUNC, error->message); g_object_unref (attachment); g_error_free (error); return; @@ -227,7 +223,6 @@ attachment_handler_import_todo (GObject *source_object, GAsyncResult *result, gpointer user_data) { - ESource *source = E_SOURCE (source_object); EAttachment *attachment = user_data; EClient *client; icalcomponent *component; @@ -243,10 +238,7 @@ attachment_handler_import_todo (GObject *source_object, ((client == NULL) && (error != NULL))); if (error != NULL) { - g_warning ( - "%s: Failed to open '%s': %s", - G_STRFUNC, e_source_get_display_name (source), - error->message); + g_warning ("%s: %s", G_STRFUNC, error->message); g_object_unref (attachment); g_error_free (error); return; diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index 4d9eee63c4..f2453e9714 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -83,10 +83,7 @@ cal_shell_backend_new_event (ESource *source, /* XXX Handle errors better. */ if (error != NULL) { - g_warning ( - "%s: Failed to open '%s': %s", - G_STRFUNC, e_source_get_display_name (source), - error->message); + g_warning ("%s: %s", G_STRFUNC, error->message); g_error_free (error); return; } diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c index 6f3d481d95..7ac64a9bc2 100644 --- a/modules/calendar/e-memo-shell-backend.c +++ b/modules/calendar/e-memo-shell-backend.c @@ -77,10 +77,7 @@ memo_shell_backend_new_memo (ESource *source, /* XXX Handle errors better. */ if (error != NULL) { - g_warning ( - "%s: Failed to open '%s': %s", - G_STRFUNC, e_source_get_display_name (source), - error->message); + g_warning ("%s: %s", G_STRFUNC, error->message); g_error_free (error); return; } diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c index 831e35de18..6fbd2afe7f 100644 --- a/modules/calendar/e-task-shell-backend.c +++ b/modules/calendar/e-task-shell-backend.c @@ -75,10 +75,7 @@ task_shell_backend_new_task (ESource *source, /* XXX Handle errors better. */ if (error != NULL) { - g_warning ( - "%s: Failed to open '%s': %s", - G_STRFUNC, e_source_get_display_name (source), - error->message); + g_warning ("%s: %s", G_STRFUNC, error->message); g_error_free (error); return; } |