diff options
| author | Jonathon Jongsma <jonathon@quotidian.org> | 2009-11-25 07:04:09 +0800 |
|---|---|---|
| committer | Jonathon Jongsma <jonathon@quotidian.org> | 2009-12-01 03:31:19 +0800 |
| commit | 007a734e88eef70451ab12777481e70c52b96ac0 (patch) | |
| tree | 123a696f11d2bd76329962a9c960814333b04764 /addressbook/gui/contact-editor | |
| parent | 0da239224f119664577c0d5dc47cab2632b083be (diff) | |
| download | gsoc2013-evolution-007a734e88eef70451ab12777481e70c52b96ac0.tar.gz gsoc2013-evolution-007a734e88eef70451ab12777481e70c52b96ac0.tar.zst gsoc2013-evolution-007a734e88eef70451ab12777481e70c52b96ac0.zip | |
port addressbook/ to use new EError API
https://bugzilla.gnome.org/show_bug.cgi?id=602963
Diffstat (limited to 'addressbook/gui/contact-editor')
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 20 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-quick-add.c | 5 |
2 files changed, 19 insertions, 6 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index fbe8e57434..2973730788 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -2344,7 +2344,11 @@ extract_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id) width = gdk_pixbuf_get_width (pixbuf); if ((height > 96 || width > 96)) { - prompt_response = e_error_run (GTK_WINDOW (editor->app), "addressbook:prompt-resize", NULL); + prompt_response = + e_error_run_dialog_for_args + (GTK_WINDOW (editor->app), + "addressbook:prompt-resize", + NULL); if (prompt_response == GTK_RESPONSE_YES) { if ( width > height) { @@ -2769,7 +2773,9 @@ categories_clicked (GtkWidget *button, EContactEditor *editor) g_free (categories); return; }else if (!(dialog = GTK_DIALOG (e_categories_dialog_new (categories)))) { - e_error_run (GTK_WINDOW (editor->app), "addressbook:edit-categories", NULL); + e_error_run_dialog_for_args (GTK_WINDOW (editor->app), + "addressbook:edit-categories", + NULL); g_free (categories); return; } @@ -3055,7 +3061,9 @@ save_contact (EContactEditor *ce, gboolean should_close) return; if (ce->target_editable && !e_book_is_writable (ce->source_book)) { - if (e_error_run (GTK_WINDOW (ce->app), "addressbook:prompt-move", NULL) == GTK_RESPONSE_NO) + if (e_error_run_dialog_for_args (GTK_WINDOW (ce->app), + "addressbook:prompt-move", + NULL) == GTK_RESPONSE_NO) return; } @@ -3201,8 +3209,10 @@ e_contact_editor_is_valid (EABEditor *editor) if (validation_error) { g_string_append (errmsg, "."); - e_error_run (GTK_WINDOW (ce->app), "addressbook:generic-error", - _("Invalid contact."), errmsg->str, NULL); + e_error_run_dialog_for_args (GTK_WINDOW (ce->app), + "addressbook:generic-error", + _("Invalid contact."), errmsg->str, + NULL); g_string_free (errmsg, TRUE); return FALSE; } diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c index 6c134192cd..ced2f2ec12 100644 --- a/addressbook/gui/contact-editor/e-contact-quick-add.c +++ b/addressbook/gui/contact-editor/e-contact-quick-add.c @@ -129,7 +129,10 @@ merge_cb (EBook *book, EBookStatus status, gpointer closure) if (e_book_is_writable (book)) eab_merging_book_add_contact (book, qa->contact, NULL, NULL); else - e_error_run (e_shell_get_active_window (NULL), "addressbook:error-read-only", e_source_peek_name (e_book_get_source (book)), NULL); + e_error_run_dialog_for_args (e_shell_get_active_window (NULL), + "addressbook:error-read-only", + e_source_peek_name (e_book_get_source (book)), + NULL); if (qa->cb) qa->cb (qa->contact, qa->closure); |