diff options
| -rw-r--r-- | plugins/exchange-operations/ChangeLog | 8 | ||||
| -rw-r--r-- | plugins/exchange-operations/exchange-account-setup.c | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog index a4da29503c..252c6566a6 100644 --- a/plugins/exchange-operations/ChangeLog +++ b/plugins/exchange-operations/ChangeLog @@ -1,3 +1,11 @@ +2005-09-14 Irene Huang <Irene.Huang@sun.com> + + Fix for #316274 + + * 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 diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c index 505e4b0350..4a693ef8ab 100644 --- a/plugins/exchange-operations/exchange-account-setup.c +++ b/plugins/exchange-operations/exchange-account-setup.c @@ -114,6 +114,7 @@ toggled_state (GtkToggleButton *button, gpointer data) 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 @@ btn_chpass_clicked (GtkButton *button, gpointer data) g_free (old_password); g_free (new_password); } +#endif static void btn_dass_clicked (GtkButton *button, gpointer data) @@ -317,11 +319,13 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) 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); @@ -329,8 +333,10 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data) btn_dass = (GtkButton*) gtk_object_new (GTK_TYPE_BUTTON, "label", _("Delegation Assitant")); gtk_signal_connect (GTK_OBJECT (btn_dass), "clicked", G_CALLBACK (btn_dass_clicked), NULL); /* Add items to the table */ +#ifdef HAVE_KRB5 gtk_table_attach_defaults (tbl_auth, GTK_WIDGET (lbl_chpass), 0, 1, 0, 1); 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); |