[Goodies-commits] r7697 - in xfce4-dict/trunk: . lib
Enrico Troeger
enrico at xfce.org
Wed Jul 8 20:31:50 CEST 2009
Author: enrico
Date: 2009-07-08 18:31:50 +0000 (Wed, 08 Jul 2009)
New Revision: 7697
Modified:
xfce4-dict/trunk/ChangeLog
xfce4-dict/trunk/lib/common.c
xfce4-dict/trunk/lib/common.h
xfce4-dict/trunk/lib/gui.c
xfce4-dict/trunk/lib/prefs.c
Log:
Allow setting an empty web search URL to disable the feature.
Modified: xfce4-dict/trunk/ChangeLog
===================================================================
--- xfce4-dict/trunk/ChangeLog 2009-07-08 17:20:18 UTC (rev 7696)
+++ xfce4-dict/trunk/ChangeLog 2009-07-08 18:31:50 UTC (rev 7697)
@@ -1,3 +1,9 @@
+2009-07-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * lib/common.c, lib/common.h, lib/gui.c, lib/prefs.c:
+ Allow setting an empty web search URL to disable the feature.
+
+
2009-05-29 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* lib/common.c, lib/common.h, lib/speedreader.c:
Modified: xfce4-dict/trunk/lib/common.c
===================================================================
--- xfce4-dict/trunk/lib/common.c 2009-07-08 17:20:18 UTC (rev 7696)
+++ xfce4-dict/trunk/lib/common.c 2009-07-08 18:31:50 UTC (rev 7697)
@@ -427,6 +427,9 @@
else
dd->mode_in_use = dd->mode_default;
+ if (! NZV(weburl) && dd->mode_in_use == DICTMODE_WEB)
+ dd->mode_in_use = DICTMODE_DICT;
+
dd->web_url = g_strdup(weburl);
dd->show_panel_entry = show_panel_entry;
dd->panel_entry_size = panel_entry_size;
Modified: xfce4-dict/trunk/lib/common.h
===================================================================
--- xfce4-dict/trunk/lib/common.h 2009-07-08 17:20:18 UTC (rev 7696)
+++ xfce4-dict/trunk/lib/common.h 2009-07-08 18:31:50 UTC (rev 7697)
@@ -99,6 +99,7 @@
GtkWidget *pref_menu_item;
GtkWidget *main_combo;
GtkWidget *main_entry;
+ GtkWidget *radio_button_web;
GtkWidget *panel_entry;
GtkWidget *main_textview;
GtkTextBuffer *main_textbuffer;
Modified: xfce4-dict/trunk/lib/gui.c
===================================================================
--- xfce4-dict/trunk/lib/gui.c 2009-07-08 17:20:18 UTC (rev 7696)
+++ xfce4-dict/trunk/lib/gui.c 2009-07-08 18:31:50 UTC (rev 7697)
@@ -704,6 +704,8 @@
gtk_box_pack_start(GTK_BOX(method_chooser), radio, FALSE, FALSE, 6);
radio = gtk_radio_button_new_with_mnemonic_from_widget(GTK_RADIO_BUTTON(radio), _("_Web Service"));
+ dd->radio_button_web = radio;
+ gtk_widget_set_sensitive(dd->radio_button_web, NZV(dd->web_url));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(radio), (dd->mode_in_use == DICTMODE_WEB));
g_signal_connect(radio, "toggled", G_CALLBACK(search_mode_web_toggled), dd);
gtk_widget_show(radio);
Modified: xfce4-dict/trunk/lib/prefs.c
===================================================================
--- xfce4-dict/trunk/lib/prefs.c 2009-07-08 17:20:18 UTC (rev 7696)
+++ xfce4-dict/trunk/lib/prefs.c 2009-07-08 18:31:50 UTC (rev 7697)
@@ -90,7 +90,7 @@
void dict_prefs_dialog_response(GtkWidget *dlg, gint response, DictData *dd)
{
- gchar *dictionary, *search_url;
+ gchar *dictionary;
/* check some values before actually saving the settings in case we need to return to
* the dialog */
@@ -105,17 +105,6 @@
gtk_widget_grab_focus(GTK_WIDGET(g_object_get_data(G_OBJECT(dlg), "dict_combo")));
return;
}
- search_url = g_strdup(gtk_entry_get_text(
- GTK_ENTRY(g_object_get_data(G_OBJECT(dlg), "web_entry"))));
- if (! NZV(search_url) || search_url[0] == '-')
- {
- dict_show_msgbox(dd, GTK_MESSAGE_ERROR, _("You must set a valid search URL."));
- g_free(search_url);
- gtk_notebook_set_current_page(
- GTK_NOTEBOOK(g_object_get_data(G_OBJECT(dlg), "notebook")), NOTEBOOK_PAGE_WEB);
- gtk_widget_grab_focus(GTK_WIDGET(g_object_get_data(G_OBJECT(dlg), "web_entry")));
- return;
- }
/* MODE DICT */
dd->port = gtk_spin_button_get_value_as_int(
@@ -130,7 +119,9 @@
/* MODE WEB */
g_free(dd->web_url);
- dd->web_url = search_url;
+ dd->web_url = g_strdup(gtk_entry_get_text(
+ GTK_ENTRY(g_object_get_data(G_OBJECT(dlg), "web_entry"))));
+ gtk_widget_set_sensitive(dd->radio_button_web, NZV(dd->web_url));
/* MODE SPELL */
dictionary = gtk_combo_box_get_active_text(
More information about the Goodies-commits
mailing list