[evolution-patches] addressbook config visibility changes

[Larry Ewing <lewing ximian com>]

JP asked me to do this, it's obvious this was intentional so let me know
if there is a problem with showing everything all the time.

--Larry

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1793
diff -u -p -r1.1793 ChangeLog
--- ChangeLog	16 Jul 2004 08:13:51 -0000	1.1793
+++ ChangeLog	19 Jul 2004 04:45:53 -0000
@@ -1,3 +1,9 @@
+2004-07-18  Larry Ewing  <lewing ximian com>
+
+	* gui/component/addressbook-config.c
+	(addressbook_config_edit_source): show all the widgets even when
+	they don't apply but make them insensitive.
+
 2004-07-14  Chris Toshok  <toshok ximian com>
 
 	[ fixes #60873, and possibly other crashes ]
Index: gui/component/addressbook-config.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook-config.c,v
retrieving revision 1.85
diff -u -p -r1.85 addressbook-config.c
--- gui/component/addressbook-config.c	21 Jun 2004 21:49:01 -0000	1.85
+++ gui/component/addressbook-config.c	19 Jul 2004 04:45:53 -0000
@@ -1186,6 +1186,8 @@ addressbook_config_edit_source (GtkWidge
 {
 	AddressbookSourceDialog *sdialog = g_new0 (AddressbookSourceDialog, 1);
 	GConfClient *gconf_client;
+	GtkWidget *connecting_vbox;
+	GtkWidget *searching_vbox;
 
 	gconf_client = gconf_client_get_default ();
 	sdialog->source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources");
@@ -1216,25 +1218,15 @@ addressbook_config_edit_source (GtkWidge
 	sdialog->ok_button = glade_xml_get_widget (sdialog->gui, "account-editor-ok-button");
 	sdialog->cancel_button = glade_xml_get_widget (sdialog->gui, "account-editor-cancel-button");
 
-#ifdef HAVE_LDAP
+	connecting_vbox = glade_xml_get_widget (sdialog->gui, "account-editor-connecting-vbox");
+	searching_vbox = glade_xml_get_widget (sdialog->gui, "account-editor-searching-vbox");
+
+	gtk_widget_show (connecting_vbox);
+	gtk_widget_show (searching_vbox);
 	if (strcmp ("ldap://";, e_source_group_peek_base_uri (sdialog->source_group))) {
-		gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-connecting-vbox"));
-		gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-searching-vbox"));
-		gtk_notebook_set_show_tabs (GTK_NOTEBOOK (sdialog->notebook), FALSE);
-		gtk_notebook_set_show_border (GTK_NOTEBOOK (sdialog->notebook), FALSE);
-		gtk_container_set_border_width (GTK_CONTAINER (glade_xml_get_widget (sdialog->gui, "account-editor-general-vbox")), 0);
-		gtk_window_set_default_size (GTK_WINDOW (sdialog->window), 332, 124);
-	} else {
-		gtk_widget_show (glade_xml_get_widget (sdialog->gui, "account-editor-connecting-vbox"));
-		gtk_widget_show (glade_xml_get_widget (sdialog->gui, "account-editor-searching-vbox"));
+		gtk_widget_set_sensitive (connecting_vbox, FALSE);
+		gtk_widget_set_sensitive (searching_vbox, FALSE);
 	}
-#else
-	gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-connecting-vbox"));
-	gtk_widget_hide (glade_xml_get_widget (sdialog->gui, "account-editor-searching-vbox"));
-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (sdialog->notebook), FALSE);
-	gtk_notebook_set_show_border (GTK_NOTEBOOK (sdialog->notebook), FALSE);
-	gtk_container_set_border_width (GTK_CONTAINER (glade_xml_get_widget (sdialog->gui, "account-editor-general-vbox")), 0);
-#endif
 
 	source_to_dialog (sdialog);