From 619bc50ccd1d7c1d994abb70a7f0db413f3285e0 Mon Sep 17 00:00:00 2001 From: Sarfraaz Ahmed Date: Mon, 11 Jul 2005 12:26:24 +0000 Subject: Check that the result is not a success and only then print the error Call 2005-07-11 Sarfraaz Ahmed * exchange-operations.c (exchange_operations_report_error) : Check that the result is not a success and only then print the error * exchange-account-setup.c (btn_chpass_clicked) : Call the error reporting routine only if there is a failure. * exchange-config-listener.c (account_added) : Similar svn path=/trunk/; revision=29718 --- plugins/exchange-operations/ChangeLog | 8 ++++++++ plugins/exchange-operations/exchange-account-setup.c | 3 ++- plugins/exchange-operations/exchange-config-listener.c | 3 ++- plugins/exchange-operations/exchange-operations.c | 3 +++ 4 files changed, 15 insertions(+), 2 deletions(-) (limited to 'plugins/exchange-operations') diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index b6f1189740..59013f0c93 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,11 @@ +2005-07-11 Sarfraaz Ahmed + + * exchange-operations.c (exchange_operations_report_error) : Check that + the result is not a success and only then print the error + * exchange-account-setup.c (btn_chpass_clicked) : Call the error + reporting routine only if there is a failure. + * exchange-config-listener.c (account_added) : Similar + 2005-07-11 Sarfraaz Ahmed Patch submitted by ArunPrakash diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 1d32b096c8..f49a9f0d63 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -129,7 +129,8 @@ btn_chpass_clicked (GtkButton *button, gpointer data) new_password = exchange_get_new_password (old_password, TRUE); g_print ("Current password is \"%s\"\n", old_password); result = exchange_account_set_password (account, old_password, new_password); - exchange_operations_report_error (account, result); + if (result != EXCHANGE_ACCOUNT_CONNECT_SUCCESS) + exchange_operations_report_error (account, result); g_free (old_password); g_free (new_password); diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c index bb85a07802..ffacddf911 100644 --- a/plugins/exchange-operations/exchange-config-listener.c +++ b/plugins/exchange-operations/exchange-config-listener.c @@ -872,7 +872,8 @@ account_added (EAccountList *account_list, EAccount *account) exchange_account); add_sources (exchange_account); exchange_account_connect (exchange_account, NULL, &result); - exchange_operations_report_error (exchange_account, result); + if (result != EXCHANGE_ACCOUNT_CONNECT_SUCCESS) + exchange_operations_report_error (exchange_account, result); add_new_sources (exchange_account); } diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c index b37473ae50..bd7f959ef5 100644 --- a/plugins/exchange-operations/exchange-operations.c +++ b/plugins/exchange-operations/exchange-operations.c @@ -192,6 +192,9 @@ exchange_operations_report_error (ExchangeAccount *account, ExchangeAccountResul gchar *error_string; g_return_if_fail (account != NULL); + + if (result == EXCHANGE_ACCOUNT_CONNECT_SUCCESS) + return; error_string = g_strconcat ("org-gnome-exchange-operations:", error_ids[result], NULL); -- cgit v1.2.3