[gspell/wip/untie-libxml: 2/5] language: lineup-substitutions



commit 8eab82c4566e3e180b7640ce3a66a0965a96055b
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Dec 10 18:27:23 2015 +0100

    language: lineup-substitutions

 gspell/gspell-language.c |   48 +++++++++++++++++++++++-----------------------
 1 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/gspell/gspell-language.c b/gspell/gspell-language.c
index 3b8c912..f66d18d 100644
--- a/gspell/gspell-language.c
+++ b/gspell/gspell-language.c
@@ -28,7 +28,7 @@
 #define ISO_639_DOMAIN "iso_639"
 #define ISO_3166_DOMAIN        "iso_3166"
 
-struct _GtkhtmlSpellLanguage {
+struct _GspellLanguage {
        gchar *code;
        gchar *name;
        gchar *ckey;
@@ -281,28 +281,28 @@ exit:
        g_tree_replace (tree, g_strdup (language_code), language_name);
 }
 
-static const GtkhtmlSpellLanguage *
-spell_language_copy (const GtkhtmlSpellLanguage *language)
+static const GspellLanguage *
+spell_language_copy (const GspellLanguage *language)
 {
        return language;
 }
 
 static void
-spell_language_free (const GtkhtmlSpellLanguage *language)
+spell_language_free (const GspellLanguage *language)
 {
        /* do nothing */
 }
 
-static const GtkhtmlSpellLanguage *
+static const GspellLanguage *
 spell_language_lookup (const gchar *language_code)
 {
-       const GtkhtmlSpellLanguage *closest_match = NULL;
+       const GspellLanguage *closest_match = NULL;
        const GList *available_languages;
 
-       available_languages = gtkhtml_spell_language_get_available ();
+       available_languages = gspell_language_get_available ();
 
        while (available_languages != NULL && language_code != NULL) {
-               GtkhtmlSpellLanguage *language = available_languages->data;
+               GspellLanguage *language = available_languages->data;
                const gchar *code = language->code;
                gsize length = strlen (code);
 
@@ -323,28 +323,28 @@ spell_language_traverse_cb (const gchar *code,
                             const gchar *name,
                             GList **available_languages)
 {
-       GtkhtmlSpellLanguage *language;
+       GspellLanguage *language;
 
-       language = g_slice_new (GtkhtmlSpellLanguage);
+       language = g_slice_new (GspellLanguage);
        language->code = g_strdup (code);
        language->name = g_strdup (name);
        language->ckey = g_utf8_collate_key (name, -1);
 
        *available_languages = g_list_insert_sorted (
                *available_languages, language,
-               (GCompareFunc) gtkhtml_spell_language_compare);
+               (GCompareFunc) gspell_language_compare);
 
        return FALSE;
 }
 
 GType
-gtkhtml_spell_language_get_type (void)
+gspell_language_get_type (void)
 {
        static GType type = 0;
 
        if (G_UNLIKELY (type == 0))
                type = g_boxed_type_register_static (
-                       "GtkhtmlSpellLanguage",
+                       "GspellLanguage",
                        (GBoxedCopyFunc) spell_language_copy,
                        (GBoxedFreeFunc) spell_language_free);
 
@@ -352,7 +352,7 @@ gtkhtml_spell_language_get_type (void)
 }
 
 const GList *
-gtkhtml_spell_language_get_available (void)
+gspell_language_get_available (void)
 {
        static gboolean initialized = FALSE;
        static GList *available_languages = NULL;
@@ -408,16 +408,16 @@ gtkhtml_spell_language_get_available (void)
        return available_languages;
 }
 
-static const GtkhtmlSpellLanguage *
+static const GspellLanguage *
 spell_language_pick_default (void)
 {
-       const GtkhtmlSpellLanguage *language = NULL;
+       const GspellLanguage *language = NULL;
        const gchar * const *language_names;
        const GList *available_languages;
        gint ii;
 
        language_names = g_get_language_names ();
-       available_languages = gtkhtml_spell_language_get_available ();
+       available_languages = gspell_language_get_available ();
 
        for (ii = 0; language == NULL && language_names[ii] != NULL; ii++)
                language = spell_language_lookup (language_names[ii]);
@@ -431,10 +431,10 @@ spell_language_pick_default (void)
        return language;
 }
 
-const GtkhtmlSpellLanguage *
-gtkhtml_spell_language_lookup (const gchar *language_code)
+const GspellLanguage *
+gspell_language_lookup (const gchar *language_code)
 {
-       const GtkhtmlSpellLanguage *language = NULL;
+       const GspellLanguage *language = NULL;
 
        language = spell_language_lookup (language_code);
 
@@ -445,7 +445,7 @@ gtkhtml_spell_language_lookup (const gchar *language_code)
 }
 
 const gchar *
-gtkhtml_spell_language_get_code (const GtkhtmlSpellLanguage *language)
+gspell_language_get_code (const GspellLanguage *language)
 {
        g_return_val_if_fail (language != NULL, NULL);
 
@@ -453,7 +453,7 @@ gtkhtml_spell_language_get_code (const GtkhtmlSpellLanguage *language)
 }
 
 const gchar *
-gtkhtml_spell_language_get_name (const GtkhtmlSpellLanguage *language)
+gspell_language_get_name (const GspellLanguage *language)
 {
        if (language == NULL)
                 /* Translators: This refers to the default language used
@@ -464,8 +464,8 @@ gtkhtml_spell_language_get_name (const GtkhtmlSpellLanguage *language)
 }
 
 gint
-gtkhtml_spell_language_compare (const GtkhtmlSpellLanguage *language_a,
-                                const GtkhtmlSpellLanguage *language_b)
+gspell_language_compare (const GspellLanguage *language_a,
+                         const GspellLanguage *language_b)
 {
        return strcmp (language_a->ckey, language_b->ckey);
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]