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/ChangeLog | 17 ++++ .../exchange-operations/exchange-account-setup.c | 2 - plugins/exchange-operations/exchange-calendar.c | 18 ++-- plugins/exchange-operations/exchange-contacts.c | 18 ++-- plugins/exchange-operations/exchange-delegates.c | 27 +++--- .../exchange-folder-subscription.c | 5 +- plugins/exchange-operations/exchange-operations.c | 8 ++ plugins/exchange-operations/exchange-operations.h | 2 + .../exchange-permissions-dialog.c | 35 +++---- .../org-gnome-exchange-operations.error.xml | 101 ++++++++++++++++++++- 10 files changed, 167 insertions(+), 66 deletions(-) (limited to 'plugins/exchange-operations') diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index 1e22cf4462..e60003c915 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,20 @@ +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. + 2005-07-25 Shakti Sen * exchange-permissions-dialog.c (add_clicked): Creating the dialog diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index e0b949ba16..1f14225386 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -49,8 +49,6 @@ #include "exchange-delegates.h" #include "exchange-change-password.h" -#define ERROR_DOMAIN "org-gnome-exchange-operations" - GtkWidget* org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data); GtkWidget *org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data); gboolean org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data); diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c index 3f793b502d..fb7603cf34 100644 --- a/plugins/exchange-operations/exchange-calendar.c +++ b/plugins/exchange-operations/exchange-calendar.c @@ -331,30 +331,26 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target) } switch (result) { - /* TODO: Modify all these error messages using e_error */ - case EXCHANGE_ACCOUNT_FOLDER_OK: - g_print ("Folder created\n"); - break; case EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS: - g_print ("Already exists\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-exists-error", NULL); break; case EXCHANGE_ACCOUNT_FOLDER_DOES_NOT_EXIST: - g_print ("Doesn't exists\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-doesnt-exist-error", NULL); break; case EXCHANGE_ACCOUNT_FOLDER_UNKNOWN_TYPE: - g_print ("Unknown type\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-unknown-type", NULL); break; case EXCHANGE_ACCOUNT_FOLDER_PERMISSION_DENIED: - g_print ("Permission denied\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-perm-error", NULL); break; case EXCHANGE_ACCOUNT_FOLDER_OFFLINE: - g_print ("Folder offline\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-offline-error", NULL); break; case EXCHANGE_ACCOUNT_FOLDER_UNSUPPORTED_OPERATION: - g_print ("Unsupported operation\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-unsupported-error", NULL); break; case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR: - g_print ("Generic error\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL); break; } diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c index c775a1f480..0dc53bf30f 100644 --- a/plugins/exchange-operations/exchange-contacts.c +++ b/plugins/exchange-operations/exchange-contacts.c @@ -300,30 +300,26 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target) } switch (result) { - /* TODO: Modify all these error messages using e_error */ - case EXCHANGE_ACCOUNT_FOLDER_OK: - g_print ("Folder created\n"); - break; case EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS: - g_print ("Already exists\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-exists-error", NULL); break; case EXCHANGE_ACCOUNT_FOLDER_DOES_NOT_EXIST: - g_print ("Doesn't exists\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-doesnt-exist-error", NULL); break; case EXCHANGE_ACCOUNT_FOLDER_UNKNOWN_TYPE: - g_print ("Unknown type\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-unknown-type", NULL); break; case EXCHANGE_ACCOUNT_FOLDER_PERMISSION_DENIED: - g_print ("Permission denied\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-perm-error", NULL); break; case EXCHANGE_ACCOUNT_FOLDER_OFFLINE: - g_print ("Folder offline\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-offline-error", NULL); break; case EXCHANGE_ACCOUNT_FOLDER_UNSUPPORTED_OPERATION: - g_print ("Unsupported operation\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-unsupported-error", NULL); break; case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR: - g_print ("Generic error\n"); + e_error_run (NULL, ERROR_DOMAIN ":folder-generic-error", NULL); break; } g_free (ruri); 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); } } diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c index 1c61df0fa2..f2fd349dac 100644 --- a/plugins/exchange-operations/exchange-folder-subscription.c +++ b/plugins/exchange-operations/exchange-folder-subscription.c @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -36,7 +37,7 @@ #include #include "exchange-config-listener.h" #include "exchange-folder-subscription.h" - +#include "exchange-operations.h" static void user_response (ENameSelectorDialog *name_selector_dialog, gint response, gpointer data) @@ -211,7 +212,7 @@ create_folder_subscription_dialog (gchar *mail_account, gchar **user_email_addre /* It would be nice to insensitivize the OK button appropriately instead of doing this, but unfortunately we can't do this for the Bonobo control. */ - e_notice (dialog, GTK_MESSAGE_ERROR, ("Please select a user.")); + e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":select-user", NULL); } diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c index c3e7eb446f..a2f004025f 100644 --- a/plugins/exchange-operations/exchange-operations.c +++ b/plugins/exchange-operations/exchange-operations.c @@ -191,6 +191,7 @@ void exchange_operations_report_error (ExchangeAccount *account, ExchangeAccountResult result) { gchar *error_string; + gchar *quota_value; g_return_if_fail (account != NULL); @@ -212,6 +213,13 @@ exchange_operations_report_error (ExchangeAccount *account, ExchangeAccountResul case EXCHANGE_ACCOUNT_UNKNOWN_ERROR: e_error_run (NULL, error_string, account->exchange_server, NULL); break; + case EXCHANGE_ACCOUNT_QUOTA_RECIEVE_ERROR: + case EXCHANGE_ACCOUNT_QUOTA_SEND_ERROR: + case EXCHANGE_ACCOUNT_QUOTA_WARN: + quota_value = g_strdup_printf ("%d", exchange_account_get_quota_limit (account)); + e_error_run (NULL, error_string, quota_value, NULL); + g_free (quota_value); + break; default: e_error_run (NULL, error_string, NULL); } diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h index e2a4f2815a..c0134aca76 100644 --- a/plugins/exchange-operations/exchange-operations.h +++ b/plugins/exchange-operations/exchange-operations.h @@ -33,6 +33,8 @@ extern "C" { #pragma } #endif /* __cplusplus */ +#define ERROR_DOMAIN "org-gnome-exchange-operations" + extern ExchangeConfigListener *exchange_global_config_listener; int e_plugin_lib_enable (EPluginLib *eplib, int enable); diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c index 46414d7bff..923f0ebae8 100644 --- a/plugins/exchange-operations/exchange-permissions-dialog.c +++ b/plugins/exchange-operations/exchange-permissions-dialog.c @@ -35,8 +35,10 @@ #include "e2k-utils.h" #include "e-folder-exchange.h" #include "exchange-account.h" +#include "exchange-operations.h" #include +#include #include #include #include @@ -223,8 +225,7 @@ exchange_permissions_dialog_new (ExchangeAccount *account, &results, &nresults); if (!E2K_HTTP_STATUS_IS_SUCCESSFUL (status) || nresults < 1) { lose: - e_notice (parent, GTK_MESSAGE_ERROR, - _("Could not read folder permissions")); + e_error_run (GTK_WINDOW (parent), ERROR_DOMAIN ":perm-read-error", NULL); gtk_widget_destroy (GTK_WIDGET (dialog)); return; } @@ -265,8 +266,7 @@ dialog_response (ExchangePermissionsDialog *dialog, int response, binsd = e2k_security_descriptor_to_binary (dialog->priv->sd); if (!binsd) { - e_notice (dialog, GTK_MESSAGE_ERROR, - _("Could not update folder permissions.")); + e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-update-error", "", NULL); return; } @@ -294,10 +294,9 @@ dialog_response (ExchangePermissionsDialog *dialog, int response, gtk_widget_set_sensitive (GTK_WIDGET (dialog), TRUE); if (!E2K_HTTP_STATUS_IS_SUCCESSFUL (status)) { - e_notice (dialog, GTK_MESSAGE_ERROR, - _("Could not update folder permissions. %s"), - status == E2K_HTTP_UNAUTHORIZED ? - _("(Permission denied.)") : ""); + e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-update-error", + status == E2K_HTTP_UNAUTHORIZED ? + _("(Permission denied.)") : "", NULL); return; } @@ -398,9 +397,8 @@ add_clicked (GtkButton *button, gpointer user_data) gc = exchange_account_get_global_catalog (dialog->priv->account); if (!gc) { - e_notice (dialog, GTK_MESSAGE_ERROR, - _("Unable to add user to access control list:\n" - "No Global Catalog server is configured for this account.")); + e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":acl-no-gcs-error", + NULL); return; } @@ -424,17 +422,13 @@ add_clicked (GtkButton *button, gpointer user_data) case E2K_GLOBAL_CATALOG_OK: break; case E2K_GLOBAL_CATALOG_NO_SUCH_USER: - e_notice (dialog, GTK_MESSAGE_ERROR, - _("No such user %s"), email); + e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":no-user-error", email, NULL); break; case E2K_GLOBAL_CATALOG_NO_DATA: - e_notice (dialog, GTK_MESSAGE_ERROR, - _("%s cannot be added to an access control list"), - email); + e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":acl-add-error", email, NULL); break; default: - e_notice (dialog, GTK_MESSAGE_ERROR, - _("Unknown error looking up %s"), email); + e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-unknown-error", email, NULL); break; } g_free (email); @@ -450,9 +444,8 @@ add_clicked (GtkButton *button, gpointer user_data) -1); bsid2 = e2k_sid_get_binary_sid (sid2); if (e2k_sid_binary_sid_equal (bsid, bsid2)) { - e_notice (dialog, GTK_MESSAGE_ERROR, - _("%s is already in the list"), - entry->display_name); + e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-existing-error", + entry->display_name, NULL); e2k_global_catalog_entry_free (gc, entry); gtk_tree_selection_select_iter (dialog->priv->list_selection, &iter); return; diff --git a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml index b89d106279..44200da47b 100644 --- a/plugins/exchange-operations/org-gnome-exchange-operations.error.xml +++ b/plugins/exchange-operations/org-gnome-exchange-operations.error.xml @@ -102,17 +102,17 @@ supports Microsoft Exchange 2000 and 2003 only. <_primary>You have exceeded your quota for storing mails on this server. - <_secondary>You will not be able to either send or recieve mails now. + <_secondary>Your current usage is : {0}KB. You will not be able to either send or recieve mails now. <_primary>You are nearing your quota available for storing mails on this server. - <_secondary>You will not be able to send mails till you clear up some space by deleting some mails. + <_secondary>Your current usage is : {0}KB. You will not be able to send mails till you clear up some space by deleting some mails. <_primary>You are nearing your quota available for storing mails on this server. - <_secondary>Try to clear up some space by deleting some mails. + <_secondary>Your current usage is : {0}KB. Try to clear up some space by deleting some mails. @@ -137,6 +137,99 @@ an unknown error occurred. Check the URL, username, and password, and try again. - + + <_primary>No Global Catalog server configured for this account. + <_secondary>Unable to edit delegates. + + + + <_primary>Unable to add user to access control list: + <_secondary>No Global Catalog server configured for this account. + + + + <_primary>Could not read folder permissions. + <_secondary>Unable to edit delegates. + + + + <_primary>Could not read folder permissions + + + + <_primary>Unable to edit delegates. + <_secondary>Could not determine folder permissions for delegates. + + + + <_primary>Could not make {0} a delegate + + + <_primary>You cannot make yourself your own delegate + + + + <_primary>{0} is already a delegate + + + + <_primary>Failed to update delegates: + <_secondary>{0} + + + + <_primary>Please select a user. + + + + <_primary>Could not update folder permissions. + <_secondary>{0} + + + + <_primary>No such user {0} + + + + <_primary>{0} cannot be added to an access control list + + + + <_primary>Unknown error looking up {0} + + + + <_primary>{0} is already in the list + + + + <_primary>Folder already exists + + + + <_primary>Folder does not exist + + + + <_primary>Permission denied + + + + <_primary>Unknown type + + + + <_primary>Folder offline + + + + <_primary>Unsupported operation + + + + <_primary>Generic error + + + -- cgit v1.2.3