diff options
Diffstat (limited to 'modules/addressbook')
| -rw-r--r-- | modules/addressbook/addressbook-config.c | 10 | ||||
| -rw-r--r-- | modules/addressbook/e-book-shell-view-actions.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/modules/addressbook/addressbook-config.c b/modules/addressbook/addressbook-config.c index 10ab0a33e1..11b3eca445 100644 --- a/modules/addressbook/addressbook-config.c +++ b/modules/addressbook/addressbook-config.c @@ -45,7 +45,7 @@ #include "addressbook-config.h" #include "e-util/e-util.h" -#include "e-util/e-error.h" +#include "e-util/e-alert.h" #include "e-util/e-util-private.h" #include "addressbook/gui/widgets/eab-config.h" @@ -267,7 +267,7 @@ addressbook_ldap_init (GtkWidget *window, ESource *source) return NULL; if (!(ldap = ldap_init (host, port))) { - e_error_run ((GtkWindow *) window, "addressbook:ldap-init", NULL); + e_alert_run_dialog_for_args ((GtkWindow *) window, "addressbook:ldap-init", NULL); goto done; } @@ -290,7 +290,7 @@ addressbook_ldap_auth (GtkWidget *window, LDAP *ldap) /* XXX use auth info from source */ ldap_error = ldap_simple_bind_s (ldap, NULL, NULL); if (LDAP_SUCCESS != ldap_error) - e_error_run ((GtkWindow *) window, "addressbook:ldap-auth", NULL); + e_alert_run_dialog_for_args ((GtkWindow *) window, "addressbook:ldap-auth", NULL); return ldap_error; } @@ -310,7 +310,7 @@ addressbook_root_dse_query (AddressbookSourceDialog *dialog, LDAP *ldap, "(objectclass=*)", (gchar **) attrs, 0, NULL, NULL, &timeout, LDAP_NO_LIMIT, resp); if (LDAP_SUCCESS != ldap_error) - e_error_run (GTK_WINDOW (dialog->window), "addressbook:ldap-search-base", NULL); + e_alert_run_dialog_for_args (GTK_WINDOW (dialog->window), "addressbook:ldap-search-base", NULL); return ldap_error; } @@ -342,7 +342,7 @@ do_ldap_root_dse_query (AddressbookSourceDialog *sdialog, GtkListStore *model, E values = ldap_get_values (ldap, resp, "namingContexts"); if (!values || values[0] == NULL || strlen (values[0]) == 0) { - e_error_run (GTK_WINDOW (sdialog->window), "addressbook:ldap-search-base", NULL); + e_alert_run_dialog_for_args (GTK_WINDOW (sdialog->window), "addressbook:ldap-search-base", NULL); goto fail; } diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c index a12dc7f6de..cf5c615238 100644 --- a/modules/addressbook/e-book-shell-view-actions.c +++ b/modules/addressbook/e-book-shell-view-actions.c @@ -21,7 +21,7 @@ #include "e-book-shell-view-private.h" -#include <e-util/e-error.h> +#include <e-util/e-alert.h> #include <e-util/e-util.h> #include <filter/e-filter-rule.h> @@ -68,7 +68,7 @@ action_address_book_delete_cb (GtkAction *action, source = e_source_selector_peek_primary_selection (selector); g_return_if_fail (source != NULL); - response = e_error_run_dialog_for_args ( + response = e_alert_run_dialog_for_args ( GTK_WINDOW (shell_window), "addressbook:ask-delete-addressbook", e_source_peek_name (source)); @@ -84,7 +84,7 @@ action_address_book_delete_cb (GtkAction *action, } if (!e_book_remove (book, NULL)) { - e_error_run_dialog_for_args ( + e_alert_run_dialog_for_args ( GTK_WINDOW (shell_window), "addressbook:remove-addressbook", NULL); g_object_unref (book); @@ -274,7 +274,7 @@ action_address_book_save_as_cb (GtkAction *action, /* XXX No callback means errors are discarded. * - * There's an EError for this which I'm not using + * There's an EAlert for this which I'm not using * until I figure out a better way to display errors: * * "addressbook:save-error" @@ -575,7 +575,7 @@ action_contact_save_as_cb (GtkAction *action, /* XXX No callback means errors are discarded. * - * There an EError for this which I'm not using + * There an EAlert for this which I'm not using * until I figure out a better way to display errors: * * "addressbook:save-error" |