Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spellcheck: allow language init to fail

Browse Source
This commit is contained in:
Christian Hergert
2021-03-15 15:24:08 -07:00
parent c77de7d328
commit cb86fcc6d5
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkspellcheck.c
View File

@@ -33,7 +33,7 @@ static gboolean gtk_enchant_supports (const char *code);
static gboolean gtk_enchant_contains_word (GtkSpellLanguage *language,
const char *word,
gssize word_length);
static void gtk_enchant_init_language (GtkSpellLanguage *language);
static gboolean gtk_enchant_init_language (GtkSpellLanguage *language);
static void gtk_enchant_fini_language (GtkSpellLanguage *language);
static GListModel *gtk_enchant_list_corrections (GtkSpellLanguage *language,
const char *word,
@@ -119,7 +119,14 @@ _gtk_spell_language_new (const GtkSpellProvider *provider,
language->code = g_strdup (code);
if (provider->init_language != NULL)
provider->init_language (language);
{
if (!provider->init_language (language))
{
g_free (language->code);
g_free (language);
return NULL;
}
}
return language;
}
@@ -457,11 +464,15 @@ gtk_enchant_list_corrections (GtkSpellLanguage *language,
return G_LIST_MODEL (model);
}
static void
static gboolean
gtk_enchant_init_language (GtkSpellLanguage *language)
{
EnchantBroker *broker = gtk_enchant_get_broker ();
language->native = enchant_broker_request_dict (broker, language->code);
if (!(language->native = enchant_broker_request_dict (broker, language->code)))
return FALSE;
return TRUE;
}
static void

2
gtk/gtkspellcheckprivate.h
View File

@@ -35,7 +35,7 @@ struct _GtkSpellProvider
GListModel *(*list_corrections) (GtkSpellLanguage *language,
const char *word,
gssize word_length);
void (*init_language) (GtkSpellLanguage *language);
gboolean (*init_language) (GtkSpellLanguage *language);
void (*fini_language) (GtkSpellLanguage *language);
gboolean (*contains_word) (GtkSpellLanguage *language,
const char *word,