[evolution/webkit-composer: 120/231] ESpellChecker: Track active languages with a hash table.
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/webkit-composer: 120/231] ESpellChecker: Track active languages with a hash table.
- Date: Fri, 13 Sep 2013 14:16:04 +0000 (UTC)
commit f8de3c215b5dfc9f0765941476797c154ca188b2
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Jan 17 18:49:33 2013 -0500
ESpellChecker: Track active languages with a hash table.
Use an internal GHashTable as a set to track active dictionaries.
Also replace:
e_spell_checker_get_active_dictionaries()
e_spell_checker_set_active_dictionaries()
with:
e_spell_checker_get_language_active()
e_spell_checker_set_language_active()
.../evolution-util/evolution-util-sections.txt | 4 +-
e-util/e-editor-actions.c | 13 +-
e-util/e-editor.c | 5 -
e-util/e-spell-checker.c | 209 +++++++++++++-------
e-util/e-spell-checker.h | 10 +-
5 files changed, 151 insertions(+), 90 deletions(-)
---
diff --git a/doc/reference/evolution-util/evolution-util-sections.txt
b/doc/reference/evolution-util/evolution-util-sections.txt
index f517691..108fc60 100644
--- a/doc/reference/evolution-util/evolution-util-sections.txt
+++ b/doc/reference/evolution-util/evolution-util-sections.txt
@@ -3806,8 +3806,8 @@ e_spell_checker_instance
e_spell_checker_list_available_dicts
e_spell_checker_ref_dictionary
e_spell_checker_get_enchant_dict
-e_spell_checker_set_active_dictionaries
-e_spell_checker_get_active_dictionaries
+e_spell_checker_get_language_active
+e_spell_checker_set_language_active
e_spell_checker_learn_word
e_spell_checker_ignore_word
<SUBSECTION Standard>
diff --git a/e-util/e-editor-actions.c b/e-util/e-editor-actions.c
index e077ad1..ea36a05 100644
--- a/e-util/e-editor-actions.c
+++ b/e-util/e-editor-actions.c
@@ -573,11 +573,12 @@ action_insert_text_file_cb (GtkAction *action,
}
static void
-action_language_cb (GtkToggleAction *action,
+action_language_cb (GtkToggleAction *toggle_action,
EEditor *editor)
{
ESpellChecker *checker;
ESpellDictionary *dictionary;
+ EEditorWidget *editor_widget;
const gchar *language_code;
GtkAction *add_action;
GList *list;
@@ -585,10 +586,14 @@ action_language_cb (GtkToggleAction *action,
gchar *action_name;
gboolean active;
- checker = e_editor_widget_get_spell_checker (editor->priv->editor_widget);
- active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
- language_code = gtk_action_get_name (GTK_ACTION (action));
+ editor_widget = e_editor_get_editor_widget (editor);
+ checker = e_editor_widget_get_spell_checker (editor_widget);
+ language_code = gtk_action_get_name (GTK_ACTION (toggle_action));
dictionary = e_spell_checker_ref_dictionary (checker, language_code);
+ g_return_if_fail (dictionary != NULL);
+
+ active = gtk_toggle_action_get_active (toggle_action);
+ e_spell_checker_set_language_active (checker, language_code, active);
/* Update the list of active dictionaries */
list = editor->priv->active_dictionaries;
diff --git a/e-util/e-editor.c b/e-util/e-editor.c
index f657a8b..8a52dc5 100644
--- a/e-util/e-editor.c
+++ b/e-util/e-editor.c
@@ -425,15 +425,10 @@ static void
editor_spell_languages_changed (EEditor *editor,
GList *dictionaries)
{
- ESpellChecker *checker;
WebKitWebSettings *settings;
GString *languages;
const GList *iter;
- /* Set the languages for spell-checker to use for suggestions etc. */
- checker = e_editor_widget_get_spell_checker (editor->priv->editor_widget);
- e_spell_checker_set_active_dictionaries (checker, dictionaries);
-
languages = g_string_new ("");
/* Join the languages codes to comma-separated list */
diff --git a/e-util/e-spell-checker.c b/e-util/e-spell-checker.c
index 92e1d5c..5f51685 100644
--- a/e-util/e-spell-checker.c
+++ b/e-util/e-spell-checker.c
@@ -31,9 +31,11 @@
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_SPELL_CHECKER, ESpellCheckerPrivate))
+#define MAX_SUGGESTIONS 10
+
struct _ESpellCheckerPrivate {
- GList *active;
EnchantBroker *broker;
+ GHashTable *active_dictionaries;
GHashTable *dictionaries_cache;
gboolean dictionaries_loaded;
@@ -86,13 +88,15 @@ wksc_check_spelling (WebKitSpellChecker *webkit_checker,
gint *misspelling_length)
{
ESpellChecker *checker = E_SPELL_CHECKER (webkit_checker);
+ GHashTable *active_dictionaries;
PangoLanguage *language;
PangoLogAttr *attrs;
GList *dicts;
gint length, ii;
- dicts = checker->priv->active;
- if (!dicts)
+ active_dictionaries = checker->priv->active_dictionaries;
+ dicts = g_hash_table_get_keys (active_dictionaries);
+ if (dicts == NULL)
return;
length = g_utf8_strlen (word, -1);
@@ -153,6 +157,8 @@ wksc_check_spelling (WebKitSpellChecker *webkit_checker,
}
g_free (attrs);
+
+ g_list_free (dicts);
}
static gchar **
@@ -161,36 +167,40 @@ wksc_get_guesses (WebKitSpellChecker *webkit_checker,
const gchar *context)
{
ESpellChecker *checker = E_SPELL_CHECKER (webkit_checker);
- GList *dicts;
+ GHashTable *active_dictionaries;
+ GList *list, *link;
gchar ** guesses;
- gint ii;
-
- guesses = g_malloc0_n (sizeof (gchar *), 11);
- ii = 0;
- for (dicts = checker->priv->active; dicts && ii < 10; dicts = dicts->next) {
- ESpellDictionary *dict;
- GList *suggestions, *iter;
- gint suggestions_count;
-
- dict = dicts->data;
- suggestions = e_spell_dictionary_get_suggestions (dict, word, -1);
-
- suggestions_count = g_list_length (suggestions);
- if (suggestions_count > 0) {
- if (suggestions_count > 10) {
- suggestions_count = 10;
- }
+ gint ii = 0;
- for (iter = suggestions; iter && ii < 10; iter = iter->next, ii++) {
- guesses[ii] = g_strdup (iter->data);
- }
+ guesses = g_new0 (gchar *, MAX_SUGGESTIONS + 1);
+
+ active_dictionaries = checker->priv->active_dictionaries;
+ list = g_hash_table_get_keys (active_dictionaries);
+
+ for (link = list; link != NULL; link = g_list_next (link)) {
+ ESpellDictionary *dictionary;
+ GList *suggestions;
+
+ dictionary = E_SPELL_DICTIONARY (link->data);
+ suggestions = e_spell_dictionary_get_suggestions (
+ dictionary, word, -1);
- guesses[ii] = 0;
+ while (suggestions != NULL && ii < MAX_SUGGESTIONS) {
+ guesses[ii++] = suggestions->data;
+ suggestions->data = NULL;
- g_list_free_full (suggestions, (GDestroyNotify) g_free);
+ suggestions = g_list_delete_link (
+ suggestions, suggestions);
}
+
+ g_list_free_full (suggestions, (GDestroyNotify) g_free);
+
+ if (ii >= MAX_SUGGESTIONS)
+ break;
}
+ g_list_free (list);
+
return guesses;
}
@@ -209,10 +219,12 @@ spell_checker_learn_word (WebKitSpellChecker *webkit_checker,
/* Carefully, this will add the word to all active dictionaries! */
ESpellChecker *checker;
+ GHashTable *active_dictionaries;
GList *list, *link;
checker = E_SPELL_CHECKER (webkit_checker);
- list = checker->priv->active;
+ active_dictionaries = checker->priv->active_dictionaries;
+ list = g_hash_table_get_keys (active_dictionaries);
for (link = list; link != NULL; link = g_list_next (link)) {
ESpellDictionary *dictionary;
@@ -220,6 +232,8 @@ spell_checker_learn_word (WebKitSpellChecker *webkit_checker,
dictionary = E_SPELL_DICTIONARY (link->data);
e_spell_dictionary_learn_word (dictionary, word, -1);
}
+
+ g_list_free (list);
}
static void
@@ -229,10 +243,12 @@ spell_checker_ignore_word (WebKitSpellChecker *webkit_checker,
/* Carefully, this will add the word to all active dictionaries */
ESpellChecker *checker;
+ GHashTable *active_dictionaries;
GList *list, *link;
checker = E_SPELL_CHECKER (webkit_checker);
- list = checker->priv->active;
+ active_dictionaries = checker->priv->active_dictionaries;
+ list = g_hash_table_get_keys (active_dictionaries);
for (link = list; link != NULL; link = g_list_next (link)) {
ESpellDictionary *dictionary;
@@ -240,6 +256,8 @@ spell_checker_ignore_word (WebKitSpellChecker *webkit_checker,
dictionary = E_SPELL_DICTIONARY (link->data);
e_spell_dictionary_ignore_word (dictionary, word, -1);
}
+
+ g_list_free (list);
}
static void
@@ -247,35 +265,57 @@ wksc_update_languages (WebKitSpellChecker *webkit_checker,
const gchar *languages)
{
ESpellChecker *checker;
- GList *dictionaries = NULL;
- gchar **langs;
- gint ii;
+ GHashTable *active_dictionaries;
+ GQueue queue = G_QUEUE_INIT;
checker = E_SPELL_CHECKER (webkit_checker);
- if (languages) {
+ active_dictionaries = checker->priv->active_dictionaries;
+
+ if (languages != NULL) {
+ gchar **langs;
+ gint ii;
+
langs = g_strsplit (languages, ",", -1);
for (ii = 0; langs[ii] != NULL; ii++) {
- ESpellDictionary *dict;
+ ESpellDictionary *dictionary;
- dict = e_spell_checker_ref_dictionary (checker, langs[ii]);
- dictionaries = g_list_append (dictionaries, dict);
+ dictionary = e_spell_checker_ref_dictionary (
+ checker, langs[ii]);
+ if (dictionary != NULL)
+ g_queue_push_tail (&queue, dictionary);
}
g_strfreev (langs);
} else {
+ ESpellDictionary *dictionary;
+ PangoLanguage *pango_language;
const gchar *language;
- ESpellDictionary *dict;
-
- language = pango_language_to_string (gtk_get_default_language ());
- dict = e_spell_checker_ref_dictionary (checker, language);
- if (dict) {
- dictionaries = g_list_append (dictionaries, dict);
- } else {
- dictionaries = e_spell_checker_list_available_dicts (checker);
+
+ pango_language = gtk_get_default_language ();
+ language = pango_language_to_string (pango_language);
+ dictionary = e_spell_checker_ref_dictionary (checker, language);
+
+ if (dictionary == NULL) {
+ GList *list;
+
+ list = e_spell_checker_list_available_dicts (checker);
+ if (list != NULL) {
+ dictionary = g_object_ref (list->data);
+ g_list_free (list);
+ }
}
+
+ if (dictionary != NULL)
+ g_queue_push_tail (&queue, dictionary);
}
- e_spell_checker_set_active_dictionaries (checker, dictionaries);
- g_list_free (dictionaries);
+ g_hash_table_remove_all (active_dictionaries);
+
+ while (!g_queue_is_empty (&queue)) {
+ ESpellDictionary *dictionary;
+
+ dictionary = g_queue_pop_head (&queue);
+ g_hash_table_add (active_dictionaries, dictionary);
+ }
}
static void
@@ -285,9 +325,7 @@ spell_checker_dispose (GObject *object)
priv = E_SPELL_CHECKER_GET_PRIVATE (object);
- g_list_free_full (priv->active, g_object_unref);
- priv->active = NULL;
-
+ g_hash_table_remove_all (priv->active_dictionaries);
g_hash_table_remove_all (priv->dictionaries_cache);
/* Chain up to parent's dispose() method. */
@@ -301,8 +339,6 @@ spell_checker_finalize (GObject *object)
priv = E_SPELL_CHECKER_GET_PRIVATE (object);
- g_hash_table_destroy (priv->dictionaries_cache);
-
/* Freeing EnchantDicts requires help from EnchantBroker. */
g_hash_table_foreach_remove (
priv->enchant_dicts,
@@ -312,6 +348,9 @@ spell_checker_finalize (GObject *object)
enchant_broker_free (priv->broker);
+ g_hash_table_destroy (priv->active_dictionaries);
+ g_hash_table_destroy (priv->dictionaries_cache);
+
/* Chain up to parent's finalize() method. */
G_OBJECT_CLASS (e_spell_checker_parent_class)->finalize (object);
}
@@ -343,9 +382,16 @@ e_spell_checker_init_webkit_checker (WebKitSpellCheckerInterface *interface)
static void
e_spell_checker_init (ESpellChecker *checker)
{
+ GHashTable *active_dictionaries;
GHashTable *dictionaries_cache;
GHashTable *enchant_dicts;
+ active_dictionaries = g_hash_table_new_full (
+ (GHashFunc) e_spell_dictionary_hash,
+ (GEqualFunc) e_spell_dictionary_equal,
+ (GDestroyNotify) g_object_unref,
+ (GDestroyNotify) NULL);
+
dictionaries_cache = g_hash_table_new_full (
(GHashFunc) g_str_hash,
(GEqualFunc) g_str_equal,
@@ -361,6 +407,7 @@ e_spell_checker_init (ESpellChecker *checker)
checker->priv = E_SPELL_CHECKER_GET_PRIVATE (checker);
checker->priv->broker = enchant_broker_init ();
+ checker->priv->active_dictionaries = active_dictionaries;
checker->priv->dictionaries_cache = dictionaries_cache;
checker->priv->enchant_dicts = enchant_dicts;
}
@@ -497,40 +544,52 @@ e_spell_checker_get_enchant_dict (ESpellChecker *checker,
checker->priv->enchant_dicts, language_code);
}
-/**
- * e_spell_checker_get_active_dictionaries:
- * @checker: an #ESpellChecker
- *
- * Returns a list of #ESpellDictionary that are to be used for spell-checking.
- *
- * Return value: a #GList of #ESpellDictionary. Free the list using g_list_fre()
- * when no longer needed.
- */
-GList *
-e_spell_checker_get_active_dictionaries (ESpellChecker *checker)
+gboolean
+e_spell_checker_get_language_active (ESpellChecker *checker,
+ const gchar *language_code)
{
- g_return_val_if_fail (E_IS_SPELL_CHECKER (checker), NULL);
+ ESpellDictionary *dictionary;
+ GHashTable *active_dictionaries;
+ gboolean active;
- return g_list_copy (checker->priv->active);
+ g_return_val_if_fail (E_IS_SPELL_CHECKER (checker), FALSE);
+ g_return_val_if_fail (language_code != NULL, FALSE);
+
+ dictionary = e_spell_checker_ref_dictionary (checker, language_code);
+ g_return_val_if_fail (dictionary != NULL, FALSE);
+
+ active_dictionaries = checker->priv->active_dictionaries;
+ active = g_hash_table_contains (active_dictionaries, dictionary);
+
+ g_object_unref (dictionary);
+
+ return active;
}
-/**
- * e_spell_checker_set_active_dictionaries:
- * @checker: an #ESpellChecker
- * @active_dicts: a #GList of #ESpellDictionary to use for spell-checking
- *
- * Set dictionaries to be actively used for spell-checking.
- */
void
-e_spell_checker_set_active_dictionaries (ESpellChecker *checker,
- GList *active_dicts)
+e_spell_checker_set_language_active (ESpellChecker *checker,
+ const gchar *language_code,
+ gboolean active)
{
+ ESpellDictionary *dictionary;
+ GHashTable *active_dictionaries;
+
g_return_if_fail (E_IS_SPELL_CHECKER (checker));
+ g_return_if_fail (language_code != NULL);
+
+ dictionary = e_spell_checker_ref_dictionary (checker, language_code);
+ g_return_if_fail (dictionary != NULL);
+
+ active_dictionaries = checker->priv->active_dictionaries;
- g_list_free_full (checker->priv->active, (GDestroyNotify) g_object_unref);
+ if (active) {
+ g_object_ref (dictionary);
+ g_hash_table_add (active_dictionaries, dictionary);
+ } else {
+ g_hash_table_remove (active_dictionaries, dictionary);
+ }
- checker->priv->active = g_list_copy (active_dicts);
- g_list_foreach (checker->priv->active, (GFunc) g_object_ref, NULL);
+ g_object_unref (dictionary);
}
/**
diff --git a/e-util/e-spell-checker.h b/e-util/e-spell-checker.h
index 6b59452..78dcb23 100644
--- a/e-util/e-spell-checker.h
+++ b/e-util/e-spell-checker.h
@@ -70,11 +70,13 @@ ESpellDictionary *
EnchantDict * e_spell_checker_get_enchant_dict
(ESpellChecker *checker,
const gchar *language_code);
-void e_spell_checker_set_active_dictionaries
+gboolean e_spell_checker_get_language_active
(ESpellChecker *checker,
- GList *active_dicts);
-GList * e_spell_checker_get_active_dictionaries
- (ESpellChecker *checker);
+ const gchar *language_code);
+void e_spell_checker_set_language_active
+ (ESpellChecker *checker,
+ const gchar *language_code,
+ gboolean active);
void e_spell_checker_learn_word (ESpellChecker *checker,
const gchar *word);
void e_spell_checker_ignore_word (ESpellChecker *checker,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
