aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/contact-editor/e-contact-quick-add.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-01-31 01:20:16 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-01-31 01:45:55 +0800
commit763081aa862908e845bc780b784d939a07abd508 (patch)
tree1a060b3cc1ae28e915348939cbbcdd28416a13b5 /addressbook/gui/contact-editor/e-contact-quick-add.c
parent0ff254b3a8946244b645f2ea74316926aa109ab6 (diff)
downloadgsoc2013-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 'addressbook/gui/contact-editor/e-contact-quick-add.c')
-rw-r--r--addressbook/gui/contact-editor/e-contact-quick-add.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index afbd817ac7..0bfa46b9a8 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -124,7 +124,6 @@ merge_cb (GObject *source_object,
GAsyncResult *result,
gpointer user_data)
{
- ESource *source = E_SOURCE (source_object);
QuickAdd *qa = user_data;
EClient *client;
GError *error = NULL;
@@ -156,12 +155,15 @@ merge_cb (GObject *source_object,
eab_merging_book_add_contact (
qa->registry, E_BOOK_CLIENT (client),
qa->contact, NULL, NULL);
- else
+ else {
+ ESource *source = e_client_get_source (client);
+
e_alert_run_dialog_for_args (
e_shell_get_active_window (NULL),
"addressbook:error-read-only",
e_source_get_display_name (source),
NULL);
+ }
if (qa->cb)
qa->cb (qa->contact, qa->closure);
@@ -299,9 +301,7 @@ ce_have_book (GObject *source_object,
}
if (error != NULL) {
- g_warning (
- "Couldn't open local address book (%s).",
- error->message);
+ g_warning ("%s", error->message);
quick_add_unref (qa);
g_error_free (error);
return;