Fixes #53433.

2004-04-01  Hari Prasad Nadig  <hp@ndeepak.info>

	Fixes #53433.

	* gui/component/addressbook-config.c (searching_tab_check): added
	the tab check for search tab.
	(dialog_to_source): added timeout to be saved.
	(source_to_dialog): just a piece to retrieve timeout from source.
	(addressbook_root_dse_query): few necessary changes.
	(do_ldap_root_dse_query): again few changes that were required.

	* gui/component/ldap-config.glade : set right the Hscale to
	display the selected value.

svn path=/trunk/; revision=25281

3 files changed, 45 insertions, 55 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index b426e40064..49ecb6d969 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,17 @@
+2004-04-01  Hari Prasad Nadig  <hp@ndeepak.info>
+
+	Fixes #53433.
+	
+	* gui/component/addressbook-config.c (searching_tab_check): added
+	the tab check for search tab.
+	(dialog_to_source): added timeout to be saved.
+	(source_to_dialog): just a piece to retrieve timeout from source.
+	(addressbook_root_dse_query): few necessary changes.
+	(do_ldap_root_dse_query): again few changes that were required.
+
+	* gui/component/ldap-config.glade : set right the Hscale to
+	display the selected value.
+	
 2004-03-30  Chris Toshok  <toshok@ximian.com>
 
 	[ fixes bug #34777 ]
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 78c7c2730d..ec4a4cb820 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -244,6 +244,11 @@ dialog_to_source (AddressbookSourceDialog *dialog, ESource *source, gboolean tem
 		str = g_strdup_printf ("%d", gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (dialog->limit_spinbutton)));
 		e_source_set_property (source, "limit", str);
 		g_free (str);
+
+		str = g_strdup_printf ("%f", gtk_adjustment_get_value (GTK_RANGE(dialog->timeout_scale)->adjustment));
+		e_source_set_property (source, "timeout", str);
+		g_free (str);
+
 		e_source_set_property (source, "ssl", ldap_unparse_ssl (dialog->ssl));
 		e_source_set_property (source, "auth", ldap_unparse_auth (dialog->auth));
 		str = g_strdup_printf ("%s:%s/%s?" /* trigraph prevention */ "?%s",
@@ -334,7 +339,10 @@ source_to_dialog (AddressbookSourceDialog *dialog)
 	gtk_spin_button_set_value ( GTK_SPIN_BUTTON (dialog->limit_spinbutton),
 				    g_strtod ( source && e_source_get_property (source, "limit") ?
 					       e_source_get_property (source, "limit") : "100", NULL));
-	
+	gtk_adjustment_set_value (GTK_RANGE(dialog->timeout_scale)->adjustment,
+				    g_strtod ( source && e_source_get_property (source, "timeout") ?
+					       e_source_get_property (source, "timeout") : "3", NULL));
+
 	dialog->auth = source && e_source_get_property (source, "auth") ?
 		ldap_parse_auth (e_source_get_property (source, "auth")) : ADDRESSBOOK_LDAP_AUTH_NONE;
 	dialog->ssl = source && e_source_get_property (source, "ssl") ?
@@ -429,13 +437,13 @@ addressbook_ldap_auth (GtkWidget *window, LDAP *ldap)
 }
 
 static int
-addressbook_root_dse_query (GtkWindow *window, LDAP *ldap, char **attrs, LDAPMessage **resp)
+addressbook_root_dse_query (AddressbookSourceDialog *dialog, GtkWindow *window, LDAP *ldap,
+char **attrs, LDAPMessage **resp)
 {
 	int ldap_error;
 	struct timeval timeout;
 
-	/* 3 second timeout */
-	timeout.tv_sec = 3;
+	timeout.tv_sec = (gint) gtk_adjustment_get_value (GTK_RANGE(dialog->timeout_scale)->adjustment);
 	timeout.tv_usec = 0;
 
 	ldap_error = ldap_search_ext_s (ldap,
@@ -743,7 +751,7 @@ supported_bases_create_table (char *name, char *string1, char *string2, int num1
 }
 
 static gboolean
-do_ldap_root_dse_query (GtkWidget *dialog, ETableModel *model, ESource *source, char ***rvalues)
+do_ldap_root_dse_query (AddressbookSourceDialog *sdialog, GtkWidget *dialog, ETableModel *model, ESource *source, char ***rvalues)
 {
 	LDAP *ldap;
 	char *attrs[2];
@@ -762,7 +770,7 @@ do_ldap_root_dse_query (GtkWidget *dialog, ETableModel *model, ESource *source,
 	attrs[0] = "namingContexts";
 	attrs[1] = NULL;
 
-	ldap_error = addressbook_root_dse_query (GTK_WINDOW (dialog), ldap, attrs, &resp);
+	ldap_error = addressbook_root_dse_query (sdialog, GTK_WINDOW (dialog), ldap, attrs, &resp);
 
 	if (ldap_error != LDAP_SUCCESS)
 		goto fail;
@@ -827,7 +835,7 @@ query_for_supported_bases (GtkWidget *button, AddressbookSourceDialog *sdialog)
 
 	search_base_selection_model_changed (selection_model, dialog);
 
-	if (do_ldap_root_dse_query (dialog, model, source, &values)) {
+	if (do_ldap_root_dse_query (sdialog, dialog, model, source, &values)) {
 		id = gtk_dialog_run (GTK_DIALOG (dialog));
 
 		gtk_widget_hide (dialog);
@@ -910,6 +918,19 @@ setup_searching_tab (AddressbookSourceDialog *dialog, ModifyFunc modify_func)
 			  G_CALLBACK(query_for_supported_bases), dialog);
 }
 
+static gboolean
+searching_tab_check (AddressbookSourceDialog *dialog)
+{
+	gboolean valid = TRUE;
+	gdouble timeout = 3;
+
+	timeout = gtk_adjustment_get_value (GTK_RANGE(dialog->timeout_scale)->adjustment);
+
+	if(!timeout)
+		return FALSE;
+	return valid;
+}
+
 static void
 druid_searching_page_prepare (GnomeDruidPage *dpage, GtkWidget *gdruid, AddressbookSourceDialog *dialog)
 {
@@ -1124,11 +1145,9 @@ editor_modify_cb (GtkWidget *item, AddressbookSourceDialog *dialog)
 		valid = general_tab_check (dialog);
 	if (valid)
 		valid = connecting_tab_check (dialog);
-#if 0
 	if (valid)
 		valid = searching_tab_check (dialog);
 #endif
-#endif
 
 	gtk_widget_set_sensitive (dialog->ok_button, valid);
 }
@@ -1208,8 +1227,7 @@ do_schema_query (AddressbookSourceDialog *sdialog)
 	attrs[0] = "objectClasses";
 	attrs[1] = NULL;
 
-	/* 3 second timeout */
-	timeout.tv_sec = 3;
+	timeout.tv_sec = (gint) gtk_adjustment_get_value (GTK_RANGE(sdialog->timeout_scale)->adjustment);
 	timeout.tv_usec = 0;
 
 	ldap_error = ldap_search_ext_s (ldap, schema_dn, LDAP_SCOPE_BASE,
diff --git a/addressbook/gui/component/ldap-config.glade b/addressbook/gui/component/ldap-config.glade
index 93ee661d60..2d97cf7251 100644
--- a/addressbook/gui/component/ldap-config.glade
+++ b/addressbook/gui/component/ldap-config.glade
@@ -2104,8 +2104,8 @@ exploits. </property>
 		    <widget class="GtkHScale" id="timeout-scale">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="draw_value">False</property>
-		      <property name="value_pos">GTK_POS_LEFT</property>
+		      <property name="draw_value">True</property>
+		      <property name="value_pos">GTK_POS_BOTTOM</property>
 		      <property name="digits">0</property>
 		      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
 		      <property name="inverted">False</property>
@@ -2138,48 +2138,6 @@ exploits. </property>
 		      <property name="fill">False</property>
 		    </packing>
 		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label460">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Selected:</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">1</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label461">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">2:30</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
-		      <property name="justify">GTK_JUSTIFY_CENTER</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
 		</widget>
 	      </child>
 	    </widget>