aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSushma Rai <rsushma@src.gnome.org>2006-01-13 18:35:16 +0800
committerSushma Rai <rsushma@src.gnome.org>2006-01-13 18:35:16 +0800
commitf4f4f94e728d3973f7d780ca9390795c31e07578 (patch)
treeb54afaa4813fe37d2f212a26a4fc5f8c72298bcf
parentb7fb796b9a02395277ebb3befda315c7ae5b61bc (diff)
downloadgsoc2013-evolution-f4f4f94e728d3973f7d780ca9390795c31e07578.tar.gz
gsoc2013-evolution-f4f4f94e728d3973f7d780ca9390795c31e07578.tar.zst
gsoc2013-evolution-f4f4f94e728d3973f7d780ca9390795c31e07578.zip
Added krb5 checks while invoking change_passwd_cb() and
exchange_config_listener_authenticate(). svn path=/trunk/; revision=31166
-rw-r--r--plugins/exchange-operations/ChangeLog5
-rw-r--r--plugins/exchange-operations/exchange-config-listener.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index d1a96b6f67..a32225760b 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-13 Sushma Rai <rsushma@novell.com>
+
+ * exchange-config-listener.c: Added krb5 checks while invoking
+ change_passwd_cb() and exchange_config_listener_authenticate().
+
2006-01-11 Chenthill Palanisamy <pchenthill@novell.com>
Fixes #271546
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 20a9d33c11..cc11a20eba 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -643,10 +643,12 @@ display_passwd_expiry_message (int max_passwd_age, ExchangeAccount *account)
change_passwd_button = glade_xml_get_widget (xml,
"change_passwd_button");
gtk_widget_set_sensitive (change_passwd_button, TRUE);
+#ifdef HAVE_KRB5
g_signal_connect (change_passwd_button,
"clicked",
G_CALLBACK (change_passwd_cb),
account);
+#endif
response = gtk_dialog_run (GTK_DIALOG (top_widget));
gtk_widget_destroy (top_widget);
@@ -693,12 +695,14 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
exchange_account_connect (account, password, &result);
g_free (password);
if (result == EXCHANGE_ACCOUNT_PASSWORD_EXPIRED) {
+#ifdef HAVE_KRB5
new_password = get_new_exchange_password (account);
if (new_password) {
/* try connecting with new password */
exchange_account_connect (account, new_password, &result);
g_free (new_password);
}
+#endif
}
else if (result == EXCHANGE_ACCOUNT_QUOTA_RECIEVE_ERROR ||
result == EXCHANGE_ACCOUNT_QUOTA_SEND_ERROR ||