From e0a96e0f961d1752d52a485101a721a1ec836541 Mon Sep 17 00:00:00 2001 From: Arunprakash Date: Mon, 25 Jul 2005 06:12:03 +0000 Subject: Changed the e_notice calls to e_error_run calls. Same. * 2005-07-25 Arunprakash * exchange-delegates.c (get_folder_security) (add_button_clicked_cb) (delegates_apply) : Changed the e_notice calls to e_error_run calls. * exchange-folder-permission.c (create_folder_subscription_dialog) : Same. * exchange-calendar.c (e_exchange_calendar_commit) : Same. * exchange-contacts.c (e_exchange_contacts_commit) : Same. * exchange-folder-subscription.c (create_folder_subscription_dialog) : Same * exchange-permissions-dialog.c (exchange_permissions_dialog_new) (dialog_response) (add_clicked): Same. * exchange-operations.c (exchange_operations_report_error) : Modified to report the quota value to the user. * org-gnome-exchange-operations.error.xml : Added few more error descriptions needed for the above changes. svn path=/trunk/; revision=29876 --- plugins/exchange-operations/exchange-delegates.c | 27 +++++++++++------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'plugins/exchange-operations/exchange-delegates.c') diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c index e706c55f36..be143ff853 100644 --- a/plugins/exchange-operations/exchange-delegates.c +++ b/plugins/exchange-operations/exchange-delegates.c @@ -31,6 +31,7 @@ #include "exchange-delegates.h" #include "exchange-delegates-user.h" #include "exchange-user-dialog.h" +#include "exchange-operations.h" #include #include @@ -40,6 +41,7 @@ #include #include +#include #include #include #include @@ -218,8 +220,8 @@ get_folder_security (ExchangeDelegates *delegates) return delegates->loaded_folders; if (!exchange_account_get_global_catalog (delegates->account)) { - e_notice (delegates->table, GTK_MESSAGE_ERROR, - _("No Global Catalog server configured for this account.\nUnable to edit delegates.")); + e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-no-gcs-error", + NULL); return FALSE; } @@ -257,15 +259,14 @@ get_folder_security (ExchangeDelegates *delegates) status = e2k_result_iter_free (iter); if (!E2K_HTTP_STATUS_IS_SUCCESSFUL (status)) { - e_notice (delegates->table, GTK_MESSAGE_ERROR, - _("Could not read folder permissions.\nUnable to edit delegates.")); + e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-perm-read-error", + NULL); return FALSE; } if (!fill_in_sids (delegates)) { delegates->loaded_folders = FALSE; - e_notice (delegates->table, GTK_MESSAGE_ERROR, - _("Could not determine folder permissions for delegates.\nUnable to edit delegates.")); + e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":perm-deter-error", NULL); return FALSE; } @@ -432,8 +433,7 @@ add_button_clicked_cb (GtkWidget *widget, gpointer data) user = exchange_delegates_user_new_from_gc (gc, email, delegates->creator_entryid); if (!user) { - e_notice (parent_window, GTK_MESSAGE_ERROR, - _("Could not make %s a delegate"), email); + e_error_run (GTK_WINDOW (parent_window), ERROR_DOMAIN ":delegate-error", email, NULL); g_free (email); return; } @@ -442,8 +442,7 @@ add_button_clicked_cb (GtkWidget *widget, gpointer data) delegate_exchange_dn = e2k_entryid_to_dn (user->entryid); if (delegate_exchange_dn && !g_ascii_strcasecmp (delegate_exchange_dn, delegates->account->legacy_exchange_dn)) { g_object_unref (user); - e_notice (parent_window, GTK_MESSAGE_ERROR, - _("You cannot make yourself your own delegate")); + e_error_run (GTK_WINDOW (parent_window), ERROR_DOMAIN ":delegate-own-error", NULL); return; } @@ -451,9 +450,8 @@ add_button_clicked_cb (GtkWidget *widget, gpointer data) match = delegates->users->pdata[u]; if (e2k_sid_binary_sid_equal (e2k_sid_get_binary_sid (user->sid), e2k_sid_get_binary_sid (match->sid))) { - e_notice (parent_window, GTK_MESSAGE_INFO, - _("%s is already a delegate"), - user->display_name); + e_error_run (GTK_WINDOW (parent_window), ERROR_DOMAIN ":delegate-existing", + user->display_name, NULL); g_object_unref (user); exchange_delegates_user_edit (match, parent_window); return; @@ -811,8 +809,7 @@ delegates_apply (ExchangeDelegates *delegates) done: if (error) { - e_notice (delegates->table, GTK_MESSAGE_ERROR, - _("Failed to update delegates:\n%s"), error); + e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegate-fail-error", error, NULL); g_free (error); } } -- cgit v1.2.3