[Goodies-commits] r5311 - in xfce4-dict/trunk: . lib
Enrico Troeger
enrico at xfce.org
Tue Aug 26 21:02:51 CEST 2008
Author: enrico
Date: 2008-08-26 19:02:51 +0000 (Tue, 26 Aug 2008)
New Revision: 5311
Modified:
xfce4-dict/trunk/ChangeLog
xfce4-dict/trunk/lib/dictd.c
xfce4-dict/trunk/lib/prefs.c
Log:
When searching for available dictionaries of a DICTD server, use the entered values in the dialog not the old saved ones.
Modified: xfce4-dict/trunk/ChangeLog
===================================================================
--- xfce4-dict/trunk/ChangeLog 2008-08-26 19:02:35 UTC (rev 5310)
+++ xfce4-dict/trunk/ChangeLog 2008-08-26 19:02:51 UTC (rev 5311)
@@ -1,6 +1,8 @@
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>
Modified: xfce4-dict/trunk/lib/dictd.c
===================================================================
--- xfce4-dict/trunk/lib/dictd.c 2008-08-26 19:02:35 UTC (rev 5310)
+++ xfce4-dict/trunk/lib/dictd.c 2008-08-26 19:02:51 UTC (rev 5311)
@@ -367,10 +367,17 @@
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;
Modified: xfce4-dict/trunk/lib/prefs.c
===================================================================
--- xfce4-dict/trunk/lib/prefs.c 2008-08-26 19:02:35 UTC (rev 5310)
+++ xfce4-dict/trunk/lib/prefs.c 2008-08-26 19:02:51 UTC (rev 5311)
@@ -421,6 +421,8 @@
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);
More information about the Goodies-commits
mailing list