When searching for available dictionaries of a DICTD server, use the entered...

When searching for available dictionaries of a DICTD server, use the entered values in the dialog not the old saved ones.

(Old svn revision: 5311)

ChangeLog

 2008-08-25  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * Make prefs dialog modal.
+ * When searching for available dictionaries of a DICTD server,
+   use the entered values in the dialog not the old saved ones.
 
 
 2008-08-03  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

lib/dictd.c

@@ -367,10 +367,17 @@ gboolean dict_dictd_get_list(GtkWidget *button, DictData *dd)
 	gchar *answer = NULL;
 	gchar **lines;
 	GtkWidget *dict_combo = g_object_get_data(G_OBJECT(button), "dict_combo");
+	GtkEntry *entry_server = g_object_get_data(G_OBJECT(button), "server_entry");
+	GtkSpinButton *entry_port = g_object_get_data(G_OBJECT(button), "port_spinner");
+	const gchar *server;
+	gint port;
 
 	dictd_init();
 
-	if ((fd = open_socket(dd->server, dd->port)) == -1)
+	server = gtk_entry_get_text(entry_server);
+	port = gtk_spin_button_get_value_as_int(entry_port);
+
+	if ((fd = open_socket(server, port)) == -1)
 	{
 		xfce_err(_("Could not connect to server."));
 		return FALSE;

lib/prefs.c

@@ -421,6 +421,8 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent, DictData *dd)
 		gtk_widget_show(button_get_list);
 		g_signal_connect(button_get_list, "clicked", G_CALLBACK(dict_dictd_get_list), dd);
 		g_object_set_data(G_OBJECT(button_get_list), "dict_combo", dict_combo);
+		g_object_set_data(G_OBJECT(button_get_list), "port_spinner", port_spinner);
+		g_object_set_data(G_OBJECT(button_get_list), "server_entry", server_entry);
 
 		/* put it all together */
 		table = gtk_table_new(3, 3, FALSE);