debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Show spell checking preferences unconditionally

Browse source
This commit is contained in:
Christian Dywan 2009-12-14 23:25:33 +01:00
parent e04a078de4
commit f905420967
1 changed files with 14 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
midori/midori-preferences.c
View file

@ -220,6 +220,7 @@ midori_preferences_add_toolbutton (GtkWidget* toolbar,
#endif #endif
} }
#if 0
static void static void
midori_preferences_list_dicts_cb (const gchar* lang_tag, midori_preferences_list_dicts_cb (const gchar* lang_tag,
const gchar* provider_name, const gchar* provider_name,
@ -233,33 +234,13 @@ midori_preferences_list_dicts_cb (const gchar* lang_tag,
static GList* static GList*
midori_preferences_get_spell_languages (void) midori_preferences_get_spell_languages (void)
{ {
static gpointer (*enchant_broker_init) (void) = NULL;
static void (*enchant_broker_list_dicts) (gpointer, GCallback, gpointer) = NULL;
static void (*enchant_broker_free) (gpointer) = NULL;
gpointer broker;
GList* dicts = NULL; GList* dicts = NULL;
gpointer broker = enchant_broker_init ();
if (!enchant_broker_list_dicts && g_module_supported ())
{
GModule* module;
if (!(module = g_module_open ("libenchant.so.1", G_MODULE_BIND_LOCAL)))
return NULL;
if (!g_module_symbol (module, "enchant_broker_init",
(void*) &enchant_broker_init))
return NULL;
if (!g_module_symbol (module, "enchant_broker_list_dicts",
(void*) &enchant_broker_list_dicts))
return NULL;
if (!g_module_symbol (module, "enchant_broker_free",
(void*) &enchant_broker_free))
return NULL;
}
broker = enchant_broker_init ();
enchant_broker_list_dicts (broker, (GCallback)midori_preferences_list_dicts_cb, &dicts); enchant_broker_list_dicts (broker, (GCallback)midori_preferences_list_dicts_cb, &dicts);
enchant_broker_free (broker); enchant_broker_free (broker);
return dicts; return dicts;
} }
#endif
/** /**
* midori_preferences_set_settings: * midori_preferences_set_settings:
@ -282,9 +263,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
GtkWidget* label; GtkWidget* label;
GtkWidget* button; GtkWidget* button;
GtkWidget* entry; GtkWidget* entry;
#if WEBKIT_CHECK_VERSION (1, 1, 6)
GList* languages;
#endif
g_return_if_fail (MIDORI_IS_PREFERENCES (preferences)); g_return_if_fail (MIDORI_IS_PREFERENCES (preferences));
g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings)); g_return_if_fail (MIDORI_IS_WEB_SETTINGS (settings));
@ -429,9 +407,8 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
button = katze_property_proxy (settings, "find-while-typing", NULL); button = katze_property_proxy (settings, "find-while-typing", NULL);
SPANNED_ADD (button); SPANNED_ADD (button);
#if WEBKIT_CHECK_VERSION (1, 1, 6) #if WEBKIT_CHECK_VERSION (1, 1, 6)
if ((languages = midori_preferences_get_spell_languages ()))
{
FRAME_NEW (_("Spell Checking")); FRAME_NEW (_("Spell Checking"));
/* FIXME: Provide a nice dictionary selection */
button = katze_property_proxy (settings, "enable-spell-checking", NULL); button = katze_property_proxy (settings, "enable-spell-checking", NULL);
gtk_button_set_label (GTK_BUTTON (button), _("Enable Spell Checking")); gtk_button_set_label (GTK_BUTTON (button), _("Enable Spell Checking"));
gtk_widget_set_tooltip_text (button, _("Enable spell checking while typing")); gtk_widget_set_tooltip_text (button, _("Enable spell checking while typing"));
@ -441,8 +418,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
gtk_widget_set_tooltip_text (entry, _("A comma separated list of " gtk_widget_set_tooltip_text (entry, _("A comma separated list of "
"languages to be used for spell checking, for example \"en_GB,de_DE\"")); "languages to be used for spell checking, for example \"en_GB,de_DE\""));
SPANNED_ADD (entry); SPANNED_ADD (entry);
g_list_free (languages);
}
#endif #endif
/* Page "Interface" */ /* Page "Interface" */