|
Lines 1-37
Link Here
|
| 1 |
--- libsexy/sexy-spell-entry.c.orig Fri Oct 14 20:20:45 2005 |
1 |
--- libsexy/sexy-spell-entry.c.orig Wed Nov 16 04:45:57 2005 |
| 2 |
+++ libsexy/sexy-spell-entry.c Sun Nov 13 13:21:06 2005 |
2 |
+++ libsexy/sexy-spell-entry.c Thu Jan 12 00:57:57 2006 |
| 3 |
@@ -799,12 +799,14 @@ |
3 |
@@ -880,10 +880,10 @@ |
|
|
4 |
static gchar * |
| 5 |
get_lang_from_dict(struct EnchantDict *dict) |
| 6 |
{ |
| 7 |
+ gchar *lang; |
| 8 |
if (!have_enchant) |
| 9 |
return NULL; |
| 10 |
|
| 11 |
- gchar *lang; |
| 12 |
enchant_dict_describe(dict, get_lang_from_dict_cb, &lang); |
| 13 |
return lang; |
| 14 |
} |
| 15 |
@@ -938,14 +938,14 @@ |
| 4 |
GSList * |
16 |
GSList * |
| 5 |
sexy_spell_entry_get_languages(const SexySpellEntry *entry) |
17 |
sexy_spell_entry_get_languages(const SexySpellEntry *entry) |
| 6 |
{ |
18 |
{ |
| 7 |
+#ifdef HAVE_ENCHANT_BROKER_LIST_DICTS |
|
|
| 8 |
+ GSList *langs = NULL; |
19 |
+ GSList *langs = NULL; |
| 9 |
+#endif |
|
|
| 10 |
+ |
20 |
+ |
| 11 |
g_return_val_if_fail(entry != NULL, NULL); |
21 |
g_return_val_if_fail(entry != NULL, NULL); |
| 12 |
g_return_val_if_fail(SEXY_IS_SPELL_ENTRY(entry), NULL); |
22 |
g_return_val_if_fail(SEXY_IS_SPELL_ENTRY(entry), NULL); |
| 13 |
|
23 |
|
| 14 |
#ifdef HAVE_ENCHANT_BROKER_LIST_DICTS |
24 |
if (enchant_broker_list_dicts == NULL) |
|
|
25 |
return NULL; |
| 26 |
|
| 15 |
- GSList *langs = NULL; |
27 |
- GSList *langs = NULL; |
| 16 |
- |
28 |
- |
| 17 |
if (!entry->priv->broker) |
29 |
if (!entry->priv->broker) |
| 18 |
return NULL; |
30 |
return NULL; |
| 19 |
|
31 |
|
| 20 |
@@ -866,13 +868,15 @@ |
32 |
@@ -1002,14 +1002,14 @@ |
| 21 |
gboolean |
33 |
gboolean |
| 22 |
sexy_spell_entry_activate_language(SexySpellEntry *entry, const gchar *lang, GError **error) |
34 |
sexy_spell_entry_activate_language(SexySpellEntry *entry, const gchar *lang, GError **error) |
| 23 |
{ |
35 |
{ |
| 24 |
+#ifdef HAVE_ENCHANT |
|
|
| 25 |
+ gboolean ret; |
36 |
+ gboolean ret; |
| 26 |
+#endif |
|
|
| 27 |
+ |
37 |
+ |
| 28 |
g_return_val_if_fail(entry != NULL, FALSE); |
38 |
g_return_val_if_fail(entry != NULL, FALSE); |
| 29 |
g_return_val_if_fail(SEXY_IS_SPELL_ENTRY(entry), FALSE); |
39 |
g_return_val_if_fail(SEXY_IS_SPELL_ENTRY(entry), FALSE); |
| 30 |
g_return_val_if_fail(lang != NULL && lang != '\0', FALSE); |
40 |
g_return_val_if_fail(lang != NULL && lang != '\0', FALSE); |
| 31 |
|
41 |
|
| 32 |
#ifdef HAVE_ENCHANT |
42 |
if (!have_enchant) |
|
|
43 |
return FALSE; |
| 44 |
- |
| 33 |
- gboolean ret; |
45 |
- gboolean ret; |
| 34 |
- |
46 |
|
| 35 |
if (error) |
47 |
if (error) |
| 36 |
g_return_val_if_fail(*error == NULL, FALSE); |
48 |
g_return_val_if_fail(*error == NULL, FALSE); |
| 37 |
|
|
|