GNOME.org
 

[evolution-exchange] Update evolution-exchange for e_error -> e_alert changes in evolution

commit c667a0ddff7268c2c9e588b65d8c8a412ac9dd7b
Author: Jonathon Jongsma <jonathon quotidian org>
Date:   Tue Dec 1 11:18:20 2009 -0600

    Update evolution-exchange for e_error -> e_alert changes in evolution
    
    https://bugzilla.gnome.org/show_bug.cgi?id=603457

 eplugin/exchange-account-setup.c       |   18 +++++++++---------
 eplugin/exchange-calendar.c            |    4 ++--
 eplugin/exchange-config-listener.c     |   10 +++++-----
 eplugin/exchange-contacts.c            |    4 ++--
 eplugin/exchange-delegates.c           |   16 ++++++++--------
 eplugin/exchange-folder-subscription.c |   10 +++++-----
 eplugin/exchange-folder.c              |   10 +++++-----
 eplugin/exchange-operations.c          |   14 +++++++-------
 eplugin/exchange-permissions-dialog.c  |   26 +++++++++++++-------------
 eplugin/exchange-send-options.c        |    6 +++---
 10 files changed, 59 insertions(+), 59 deletions(-)
---
diff --git a/eplugin/exchange-account-setup.c b/eplugin/exchange-account-setup.c
index 66cbf54..7b8e874 100644
--- a/eplugin/exchange-account-setup.c
+++ b/eplugin/exchange-account-setup.c
@@ -25,7 +25,7 @@
 #endif
 
 #include "libedataserver/e-account.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -236,7 +236,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	exchange_config_listener_get_offline_status (exchange_global_config_listener,
 								    &offline_status);
 	if (offline_status == OFFLINE_MODE) {
-		e_error_run (GTK_WINDOW (data->config->target->widget), ERROR_DOMAIN ":exchange-settings-offline", NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (data->config->target->widget), ERROR_DOMAIN ":exchange-settings-offline", NULL);
 
 		return NULL;
 	}
@@ -251,7 +251,7 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 
 	if (account && !exchange_oof_get (account, &oof_state, &message)) {
 
-		e_error_run (GTK_WINDOW (data->config->target->widget), ERROR_DOMAIN ":state-read-error", NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (data->config->target->widget), ERROR_DOMAIN ":state-read-error", NULL);
 
                 return NULL;
         }
@@ -389,11 +389,11 @@ print_error (GtkWidget *parent, const gchar *owa_url, E2kAutoconfigResult result
 	switch (result) {
 
 		case E2K_AUTOCONFIG_CANT_CONNECT:
-			e_error_run (GTK_WINDOW (parent), ERROR_DOMAIN ":account-connect-error", "", NULL);
+			e_alert_run_dialog_for_args (GTK_WINDOW (parent), ERROR_DOMAIN ":account-connect-error", "", NULL);
 			break;
 
 		case E2K_AUTOCONFIG_CANT_RESOLVE:
-			e_error_run (GTK_WINDOW (parent), ERROR_DOMAIN ":account-resolve-error", "", NULL);
+			e_alert_run_dialog_for_args (GTK_WINDOW (parent), ERROR_DOMAIN ":account-resolve-error", "", NULL);
 			break;
 
 		case E2K_AUTOCONFIG_AUTH_ERROR:
@@ -412,7 +412,7 @@ print_error (GtkWidget *parent, const gchar *owa_url, E2kAutoconfigResult result
 			break;
 
 		case E2K_AUTOCONFIG_CANT_BPROPFIND:
-			e_error_run (GTK_WINDOW (parent), ERROR_DOMAIN ":connect-exchange-error",
+			e_alert_run_dialog_for_args (GTK_WINDOW (parent), ERROR_DOMAIN ":connect-exchange-error",
 				     "http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html";,
 				     NULL);
 			break;
@@ -428,7 +428,7 @@ print_error (GtkWidget *parent, const gchar *owa_url, E2kAutoconfigResult result
 	}
 
 	if (err_msg)
-		e_error_run (GTK_WINDOW (parent), err_msg, NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (parent), err_msg, NULL);
 }
 
 static const gchar *
@@ -485,7 +485,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 	   THIS IS TOTALLY UNNACCEPTABLE!!!!!!!!
 
 	   It must use camel_session_ask_password, and it should return an exception for any problem,
-	   which should then be shown using e-error */
+	   which should then be shown using e-alert */
 
 	owa_url = camel_url_get_param (url, "owa_url");
 	if (camel_url_get_param (url, "authmech"))
@@ -858,7 +858,7 @@ set_oof_info (GtkWidget *parent)
 
 	if (account && !exchange_oof_set (account, oof_data->state, oof_data->message)) {
 
-		e_error_run (GTK_WINDOW (parent), ERROR_DOMAIN ":state-update-error", NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (parent), ERROR_DOMAIN ":state-update-error", NULL);
 	}
 }
 
diff --git a/eplugin/exchange-calendar.c b/eplugin/exchange-calendar.c
index 720b022..dafe072 100644
--- a/eplugin/exchange-calendar.c
+++ b/eplugin/exchange-calendar.c
@@ -34,7 +34,7 @@
 #include "mail/em-account-editor.h"
 #include "mail/em-config.h"
 #include "libedataserver/e-account.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 
 #include "exchange-operations.h"
 #include "exchange-folder-size-display.h"
@@ -527,7 +527,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
 	}
 
 	if (err_msg)
-		e_error_run (GTK_WINDOW (target->widget), err_msg, NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (target->widget), err_msg, NULL);
  done:
 	g_free (uri_text);
 	g_free (username);
diff --git a/eplugin/exchange-config-listener.c b/eplugin/exchange-config-listener.c
index 6ff30bd..c19f92e 100644
--- a/eplugin/exchange-config-listener.c
+++ b/eplugin/exchange-config-listener.c
@@ -38,7 +38,7 @@
 #include <e2k-uri.h>
 #include <camel/camel-url.h>
 
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 #include <shell/e-shell.h>
 
 #include <libedataserver/e-source.h>
@@ -901,7 +901,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 		}
 
 		if (current_quota_usage) {
-			widget = e_error_new (e_shell_get_active_window (NULL), error_code, current_quota_usage, NULL);
+			widget = e_alert_new_dialog_for_args (e_shell_get_active_window (NULL), error_code, current_quota_usage, NULL);
 			g_signal_connect ((GtkDialog *)widget, "response",
 					  G_CALLBACK (gtk_widget_destroy), widget);
 			gtk_widget_show (widget);
@@ -929,7 +929,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
 				/* OOF state is set, check if user wants to set it back to in-office */
 				if (run_oof_dialog () == GTK_RESPONSE_YES)
 					if (!exchange_oof_set (account, FALSE, NULL))
-						e_error_run (e_shell_get_active_window (NULL), "org-gnome-exchange-operations:state-update-error", NULL);
+						e_alert_run_dialog_for_args (e_shell_get_active_window (NULL), "org-gnome-exchange-operations:state-update-error", NULL);
 			}
 		}
 	}
@@ -949,7 +949,7 @@ account_added (EAccountList *account_list, EAccount *account)
 	config_listener = EXCHANGE_CONFIG_LISTENER (account_list);
 	if (config_listener->priv->configured_account) {
 		/* Multiple accounts configured. */
-		e_error_run (e_shell_get_active_window (NULL), "org-gnome-exchange-operations:single-account-error", NULL);
+		e_alert_run_dialog_for_args (e_shell_get_active_window (NULL), "org-gnome-exchange-operations:single-account-error", NULL);
 		return;
 	}
 
@@ -1148,7 +1148,7 @@ account_changed (EAccountList *account_list, EAccount *account)
 	}
 
 	/* Nope. Let the user know we're ignoring him. */
-	e_error_run (e_shell_get_active_window (NULL), "org-gnome-exchange-operations:apply-restart",
+	e_alert_run_dialog_for_args (e_shell_get_active_window (NULL), "org-gnome-exchange-operations:apply-restart",
 		     priv->configured_name, NULL);
 
 	/* But note the new URI so if he changes something else, we
diff --git a/eplugin/exchange-contacts.c b/eplugin/exchange-contacts.c
index 99c386c..9deb1b8 100644
--- a/eplugin/exchange-contacts.c
+++ b/eplugin/exchange-contacts.c
@@ -37,7 +37,7 @@
 #include "mail/em-account-editor.h"
 #include "mail/em-config.h"
 #include "libedataserver/e-account.h"
-#include "e-util/e-error.h"
+#include "e-util/e-alert.h"
 
 #include "exchange-operations.h"
 #include "exchange-folder-size-display.h"
@@ -538,7 +538,7 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 	}
 
 	if (err_msg)
-		e_error_run (GTK_WINDOW (target->widget), err_msg, NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (target->widget), err_msg, NULL);
  done:
 	g_free (ruri);
 	g_free (username);
diff --git a/eplugin/exchange-delegates.c b/eplugin/exchange-delegates.c
index 4168191..7cbd379 100644
--- a/eplugin/exchange-delegates.c
+++ b/eplugin/exchange-delegates.c
@@ -43,7 +43,7 @@
 #include <e2k-utils.h>
 
 #include <e-util/e-dialog-utils.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 
 typedef struct {
 	const gchar *uri;
@@ -213,7 +213,7 @@ get_folder_security (ExchangeDelegates *delegates)
 		return delegates->loaded_folders;
 
 	if (!exchange_account_get_global_catalog (delegates->account)) {
-		e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-no-gcs-error",
+		e_alert_run_dialog_for_args (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-no-gcs-error",
 			     NULL);
 		return FALSE;
 	}
@@ -252,14 +252,14 @@ get_folder_security (ExchangeDelegates *delegates)
 	status = e2k_result_iter_free (iter);
 
 	if (!E2K_HTTP_STATUS_IS_SUCCESSFUL (status)) {
-		e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-perm-read-error",
+		e_alert_run_dialog_for_args (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegates-perm-read-error",
 			     NULL);
 		return FALSE;
 	}
 
 	if (!fill_in_sids (delegates)) {
 		delegates->loaded_folders = FALSE;
-		e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":perm-deter-error", NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":perm-deter-error", NULL);
 		return FALSE;
 	}
 
@@ -425,7 +425,7 @@ add_button_clicked_cb (GtkWidget *widget, gpointer data)
 	user = exchange_delegates_user_new_from_gc (gc, email,
 						    delegates->creator_entryid);
 	if (!user) {
-		e_error_run (GTK_WINDOW (parent_window), ERROR_DOMAIN ":delegate-error", email, NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (parent_window), ERROR_DOMAIN ":delegate-error", email, NULL);
 		g_free (email);
 		return;
 	}
@@ -434,7 +434,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_error_run (GTK_WINDOW (parent_window), ERROR_DOMAIN ":delegate-own-error", NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (parent_window), ERROR_DOMAIN ":delegate-own-error", NULL);
 		return;
 	}
 
@@ -442,7 +442,7 @@ 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_error_run (GTK_WINDOW (parent_window), ERROR_DOMAIN ":delegate-existing",
+			e_alert_run_dialog_for_args (GTK_WINDOW (parent_window), ERROR_DOMAIN ":delegate-existing",
 				     user->display_name, NULL);
 			g_object_unref (user);
 			exchange_delegates_user_edit (delegates->account, match, parent_window);
@@ -822,7 +822,7 @@ delegates_apply (ExchangeDelegates *delegates)
 
  done:
 	if (error) {
-		e_error_run (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegate-fail-error", error, NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (delegates->table), ERROR_DOMAIN ":delegate-fail-error", error, NULL);
 		g_free (error);
 	}
 }
diff --git a/eplugin/exchange-folder-subscription.c b/eplugin/exchange-folder-subscription.c
index c180672..68fc519 100644
--- a/eplugin/exchange-folder-subscription.c
+++ b/eplugin/exchange-folder-subscription.c
@@ -26,7 +26,7 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 #include <e-folder.h>
 #include <exchange-account.h>
 #include <exchange-hierarchy.h>
@@ -200,7 +200,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 			subscriber_email = exchange_account_get_email_id (subscription_info->account);
 			if (subscriber_email != NULL && *subscriber_email != '\0') {
 				if (g_str_equal (subscriber_email, user_email_address)) {
-					e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":folder-exists-error", NULL);
+					e_alert_run_dialog_for_args (GTK_WINDOW (dialog), ERROR_DOMAIN ":folder-exists-error", NULL);
 					g_free (user_email_address);
 					gtk_widget_destroy (dialog);
 					destroy_subscription_info (subscription_info);
@@ -211,7 +211,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 			/* It would be nice to insensitivize the OK button appropriately
 			instead of doing this, but unfortunately we can't do this for the
 			control.  */
-			e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":select-user", NULL);
+			e_alert_run_dialog_for_args (GTK_WINDOW (dialog), ERROR_DOMAIN ":select-user", NULL);
 		}
 
 		folder_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (subscription_info->folder_name_entry)));
@@ -250,7 +250,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 					err_msg = ERROR_DOMAIN ":folder-no-gc-error";
 					break;
 				case EXCHANGE_ACCOUNT_FOLDER_NO_SUCH_USER:
-					e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":no-user-error", user_email_address, NULL);
+					e_alert_run_dialog_for_args (GTK_WINDOW (dialog), ERROR_DOMAIN ":no-user-error", user_email_address, NULL);
 					break;
 				case EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR:
 					err_msg = ERROR_DOMAIN ":folder-generic-error";
@@ -260,7 +260,7 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
 			}
 
 			if (err_msg)
-				e_error_run (GTK_WINDOW (dialog), err_msg, NULL);
+				e_alert_run_dialog_for_args (GTK_WINDOW (dialog), err_msg, NULL);
 		}
 
 		if (!folder) {
diff --git a/eplugin/exchange-folder.c b/eplugin/exchange-folder.c
index dff8edb..e6a54ca 100644
--- a/eplugin/exchange-folder.c
+++ b/eplugin/exchange-folder.c
@@ -30,7 +30,7 @@
 #include <e-folder-exchange.h>
 #include <exchange-hierarchy.h>
 #include <libedataserverui/e-source-selector.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 #include <camel/camel-store.h>
 #include <camel/camel-folder.h>
 #include <mail/mail-mt.h>
@@ -163,7 +163,7 @@ eex_folder_inbox_unsubscribe (const gchar *uri)
 	}
 
 	if (err_msg) {
-		e_error_run (e_shell_get_active_window (NULL), err_msg, NULL);
+		e_alert_run_dialog_for_args (e_shell_get_active_window (NULL), err_msg, NULL);
 		return;
 	}
 
@@ -291,7 +291,7 @@ eex_addresssbook_unsubscribe (ESource *source)
 		g_warning ("Config listener not found");
 		return;
 	} else if (mode == OFFLINE_MODE) {
-		e_error_run (e_shell_get_active_window (NULL), ERROR_DOMAIN ":account-offline-generic", NULL);
+		e_alert_run_dialog_for_args (e_shell_get_active_window (NULL), ERROR_DOMAIN ":account-offline-generic", NULL);
 		return;
 	}
 
@@ -345,7 +345,7 @@ eex_calendar_unsubscribe (ESource *source)
 		g_warning ("Config listener not found");
 		return;
 	} else if (mode == OFFLINE_MODE) {
-		e_error_run (e_shell_get_active_window (NULL), ERROR_DOMAIN ":account-offline-generic", NULL);
+		e_alert_run_dialog_for_args (e_shell_get_active_window (NULL), ERROR_DOMAIN ":account-offline-generic", NULL);
 		return;
 	}
 
@@ -397,7 +397,7 @@ call_folder_subscribe (const gchar *folder_name)
 		 * (like subscribing to other user's folders, unsubscribing
 		 * etc,) which can not be performed in offline mode
 		 */
-		e_error_run (e_shell_get_active_window (NULL), ERROR_DOMAIN ":account-offline-generic", NULL);
+		e_alert_run_dialog_for_args (e_shell_get_active_window (NULL), ERROR_DOMAIN ":account-offline-generic", NULL);
 		return;
 	}
 
diff --git a/eplugin/exchange-operations.c b/eplugin/exchange-operations.c
index d6ab918..dc56c56 100644
--- a/eplugin/exchange-operations.c
+++ b/eplugin/exchange-operations.c
@@ -26,7 +26,7 @@
 #include "exchange-operations.h"
 #include <e-folder-exchange.h>
 #include <exchange-hierarchy.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 #include <shell/e-shell.h>
 
 ExchangeConfigListener *exchange_global_config_listener=NULL;
@@ -240,26 +240,26 @@ exchange_operations_report_error (ExchangeAccount *account, ExchangeAccountResul
 
 	switch (result) {
 		case EXCHANGE_ACCOUNT_MAILBOX_NA:
-			widget = e_error_new (e_shell_get_active_window (NULL), error_string, exchange_account_get_username (account), NULL);
+			widget = e_alert_new_dialog_for_args (e_shell_get_active_window (NULL), error_string, exchange_account_get_username (account), NULL);
 			break;
 		case EXCHANGE_ACCOUNT_NO_MAILBOX:
-			widget = e_error_new (e_shell_get_active_window (NULL), error_string, exchange_account_get_username (account),
-					      account->exchange_server, NULL);
+			widget = e_alert_new_dialog_for_args (e_shell_get_active_window (NULL), error_string, exchange_account_get_username (account),
+							      account->exchange_server, NULL);
 			break;
 		case EXCHANGE_ACCOUNT_RESOLVE_ERROR:
 		case EXCHANGE_ACCOUNT_CONNECT_ERROR:
 		case EXCHANGE_ACCOUNT_UNKNOWN_ERROR:
-			widget = e_error_new (e_shell_get_active_window (NULL), error_string, account->exchange_server, NULL);
+			widget = e_alert_new_dialog_for_args (e_shell_get_active_window (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 ("%.2f", account->mbox_size);
-			widget = e_error_new (e_shell_get_active_window (NULL), error_string, quota_value, NULL);
+			widget = e_alert_new_dialog_for_args (e_shell_get_active_window (NULL), error_string, quota_value, NULL);
 			g_free (quota_value);
 			break;
 		default:
-			widget = e_error_new (e_shell_get_active_window (NULL), error_string, NULL);
+			widget = e_alert_new_dialog_for_args (e_shell_get_active_window (NULL), error_string, NULL);
 	}
 	g_signal_connect ((GtkDialog *)widget, "response", G_CALLBACK (gtk_widget_destroy), widget);
 	gtk_widget_show (widget);
diff --git a/eplugin/exchange-permissions-dialog.c b/eplugin/exchange-permissions-dialog.c
index b3a5fb9..7533abe 100644
--- a/eplugin/exchange-permissions-dialog.c
+++ b/eplugin/exchange-permissions-dialog.c
@@ -40,7 +40,7 @@
 #include "exchange-operations.h"
 
 #include <e-util/e-dialog-utils.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 
 struct _ExchangePermissionsDialogPrivate {
 	ExchangeAccount *account;
@@ -200,7 +200,7 @@ exchange_permissions_dialog_new (ExchangeAccount *account,
 				       &results, &nresults);
 	if (!E2K_HTTP_STATUS_IS_SUCCESSFUL (status) || nresults < 1) {
 	lose:
-		e_error_run (GTK_WINDOW (parent), ERROR_DOMAIN ":perm-read-error", NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (parent), ERROR_DOMAIN ":perm-read-error", NULL);
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 		if (nresults)
 			e2k_results_free (results, nresults);
@@ -245,7 +245,7 @@ dialog_response (ExchangePermissionsDialog *dialog, gint response,
 
 	binsd = e2k_security_descriptor_to_binary (dialog->priv->sd);
 	if (!binsd) {
-		e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-update-error", "", NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-update-error", "", NULL);
 		return;
 	}
 
@@ -273,9 +273,9 @@ dialog_response (ExchangePermissionsDialog *dialog, gint response,
 	gtk_widget_set_sensitive (GTK_WIDGET (dialog), TRUE);
 
 	if (!E2K_HTTP_STATUS_IS_SUCCESSFUL (status)) {
-		e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-update-error",
-			     status == E2K_HTTP_UNAUTHORIZED ?
-			     _("(Permission denied.)") : "", NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-update-error",
+					     status == E2K_HTTP_UNAUTHORIZED ?
+					     _("(Permission denied.)") : "", NULL);
 		return;
 	}
 
@@ -376,8 +376,8 @@ add_clicked (GtkButton *button, gpointer user_data)
 	gc = exchange_account_get_global_catalog (dialog->priv->account);
 
 	if (!gc) {
-		e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":acl-no-gcs-error",
-			     NULL);
+		e_alert_run_dialog_for_args (GTK_WINDOW (dialog), ERROR_DOMAIN ":acl-no-gcs-error",
+					     NULL);
 		return;
 	}
 
@@ -401,13 +401,13 @@ add_clicked (GtkButton *button, gpointer user_data)
 			case E2K_GLOBAL_CATALOG_OK:
 				break;
 			case E2K_GLOBAL_CATALOG_NO_SUCH_USER:
-				e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":no-user-error", email, NULL);
+				e_alert_run_dialog_for_args (GTK_WINDOW (dialog), ERROR_DOMAIN ":no-user-error", email, NULL);
 				break;
 			case E2K_GLOBAL_CATALOG_NO_DATA:
-				e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":acl-add-error", email, NULL);
+				e_alert_run_dialog_for_args (GTK_WINDOW (dialog), ERROR_DOMAIN ":acl-add-error", email, NULL);
 				break;
 			default:
-				e_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-unknown-error", email, NULL);
+				e_alert_run_dialog_for_args (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-unknown-error", email, NULL);
 				break;
 		}
 		if (status != E2K_GLOBAL_CATALOG_OK)
@@ -422,8 +422,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_error_run (GTK_WINDOW (dialog), ERROR_DOMAIN ":perm-existing-error",
-					     entry->display_name, NULL);
+				e_alert_run_dialog_for_args (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/eplugin/exchange-send-options.c b/eplugin/exchange-send-options.c
index 0b8722b..1e1bd0c 100644
--- a/eplugin/exchange-send-options.c
+++ b/eplugin/exchange-send-options.c
@@ -29,7 +29,7 @@
 #include <libedataserverui/e-contact-store.h>
 #include "exchange-operations.h"
 #include <e-util/e-util.h>
-#include <e-util/e-error.h>
+#include <e-util/e-alert.h>
 
 #include "exchange-send-options.h"
 
@@ -126,7 +126,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 		}
 
 		if (count == 0) {
-			e_error_run ((GtkWindow *) priv->main,
+			e_alert_run_dialog_for_args ((GtkWindow *) priv->main,
 				"org-gnome-exchange-operations:no-delegate-selected", NULL, NULL);
 			gtk_widget_grab_focus ((GtkWidget *) name_selector_entry);
 			options->delegate_address = NULL;
@@ -136,7 +136,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
 		}
 
 		if (count > 1) {
-			e_error_run ((GtkWindow *)priv->main,
+			e_alert_run_dialog_for_args ((GtkWindow *)priv->main,
 				"org-gnome-exchange-operations:more-delegates-selected", NULL, NULL);
 			gtk_widget_grab_focus ((GtkWidget *) name_selector_entry);
 			options->delegate_address = NULL;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]