[evolution-patches][connector] fix for bug #316274

[Shiying Irene Huang <Irene Huang Sun COM>]

Hi, Ximian Connector maintainers

The attached patch fixes are for bug #316274. 

The mentioned  bug is fixed by removing the feature of checking whether
the password is expired or not. 

Reviews are appreciated. 

Regards

Irene Huang

Index: servers/exchange/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/ChangeLog,v
retrieving revision 1.29
diff -u -r1.29 ChangeLog
--- servers/exchange/ChangeLog	25 Aug 2005 14:29:59 -0000	1.29
+++ servers/exchange/ChangeLog	14 Sep 2005 08:43:07 -0000
@@ -1,3 +1,8 @@
+2005-09-14  Irene Huang  <Irene Huang sun com>
+
+	* storage/exchange-account.h: only declare exchange_account_set_
+	password function when the macro HAVE_KRB5 is defined.
+
 2005-08-25  Arunprakash  <arunp novell com>
 
 	* storage/exchange-account.c (init) : set the default linestatus
Index: servers/exchange/storage/exchange-account.h
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/storage/exchange-account.h,v
retrieving revision 1.5
diff -u -r1.5 exchange-account.h
--- servers/exchange/storage/exchange-account.h	11 Jul 2005 06:32:50 -0000	1.5
+++ servers/exchange/storage/exchange-account.h	14 Sep 2005 08:43:08 -0000
@@ -102,9 +102,12 @@
 
 char 		      *exchange_account_get_password 	     (ExchangeAccount  *acct);
 
+#ifdef HAVE_KRB5
 ExchangeAccountResult exchange_account_set_password 	     (ExchangeAccount  *acct,
 							      char             *old_password,
 							      char             *new_password);
+#endif
+
 void 		       exchange_account_forget_password       (ExchangeAccount  *acct);
 
 gboolean	       exchange_account_set_offline          (ExchangeAccount  *account);

Index: plugins/exchange-operations/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/ChangeLog,v
retrieving revision 1.51
diff -u -r1.51 ChangeLog
--- plugins/exchange-operations/ChangeLog	29 Aug 2005 12:25:13 -0000	1.51
+++ plugins/exchange-operations/ChangeLog	14 Sep 2005 08:35:36 -0000
@@ -1,3 +1,9 @@
+2005-09-14  Irene Huang <Irene Huang sun com>
+
+	* exchange-account-setup.c: (btn_chpass_clicked),
+	(org_gnome_exchange_settings): Enable change password function only 
+	when built with kerberos5.  
+
 2005-08-29  Praveen Kumar  <kpraveen novell com>
 
 	** Fixes bug 314762
Index: plugins/exchange-operations/exchange-account-setup.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-account-setup.c,v
retrieving revision 1.18
diff -u -r1.18 exchange-account-setup.c
--- plugins/exchange-operations/exchange-account-setup.c	24 Aug 2005 09:43:41 -0000	1.18
+++ plugins/exchange-operations/exchange-account-setup.c	14 Sep 2005 08:35:40 -0000
@@ -114,6 +114,7 @@
 	gtk_widget_set_sensitive (oof_data->text_view, current_oof_state);
 }
 
+#ifdef HAVE_KRB5
 static void
 btn_chpass_clicked (GtkButton *button, gpointer data)
 {
@@ -141,6 +142,7 @@
 	g_free (old_password);
 	g_free (new_password);	
 }
+#endif
 
 static void
 btn_dass_clicked (GtkButton *button, gpointer data)
@@ -317,11 +319,13 @@
 
 	tbl_auth = (GtkTable*) gtk_object_new (GTK_TYPE_TABLE, "n-rows", 2, "n-columns", 2, "homogeneous", FALSE, "row-spacing", 6, "column-spacing", 6, NULL);
 
+#ifdef HAVE_KRB5
 	/* Change Password */
 	lbl_chpass = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("Change the password for Exchange account"), NULL);
 	gtk_misc_set_alignment (GTK_MISC (lbl_chpass), 0, 0.5);
 	btn_chpass = (GtkButton*) gtk_object_new (GTK_TYPE_BUTTON, "label", _("Change Password"), NULL);
 	gtk_signal_connect (GTK_OBJECT (btn_chpass), "clicked", G_CALLBACK (btn_chpass_clicked), NULL);
+#endif
 
 	/* Delegation Assistant */
 	lbl_dass = (GtkLabel*) gtk_object_new (GTK_TYPE_LABEL, "label", _("Manage the delegate settings for Exchange account"), NULL);
@@ -330,7 +334,9 @@
 	gtk_signal_connect (GTK_OBJECT (btn_dass), "clicked", G_CALLBACK (btn_dass_clicked), NULL);
 	/* Add items to the table */
 	gtk_table_attach_defaults (tbl_auth, GTK_WIDGET (lbl_chpass), 0, 1, 0, 1);
+#ifdef HAVE_KRB5
 	gtk_table_attach (tbl_auth, GTK_WIDGET (btn_chpass), 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+#endif
 	gtk_table_attach_defaults (tbl_auth, GTK_WIDGET (lbl_dass), 0, 1, 1, 2);
 	gtk_table_attach (tbl_auth, GTK_WIDGET (btn_dass), 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_box_pack_start (GTK_BOX (vbox_auth), GTK_WIDGET (tbl_auth), FALSE, FALSE, 0);