1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
From 114c4f78ac9882be51c4154751760bd4fea48403 Mon Sep 17 00:00:00 2001
From: Álvaro Peña <alvaropg@gmail.com>
Date: Wed, 06 Feb 2013 10:12:54 +0000
Subject: Update GtkSpell 3 support
---
diff --git a/configure.ac b/configure.ac
index b89ba74..fbe6889 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,7 +95,7 @@ AC_SUBST(EVO_LIBS)
dnl Spell checking
if test $spell_checking = "true"; then
- PKG_CHECK_MODULES(SPELL_CHECKING, gtkspell-3.0)
+ PKG_CHECK_MODULES(SPELL_CHECKING, gtkspell3-3.0)
AC_SUBST(SPELL_CHECKING_CFLAGS)
AC_SUBST(SPELL_CHECKING_LIBS)
fi
diff --git a/src/main-window.c b/src/main-window.c
index fb931e1..2fe01ef 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -1109,7 +1109,7 @@ mw_calendar_day_selected_cb (AlmanahCalendarButton *calendar_button, AlmanahMain
AlmanahEventManager *event_manager;
GDate calendar_date;
#ifdef ENABLE_SPELL_CHECKING
- GtkSpell *gtkspell;
+ GtkSpellChecker *gtkspell;
#endif /* ENABLE_SPELL_CHECKING */
AlmanahMainWindowPrivate *priv = main_window->priv;
AlmanahEntry *entry;
@@ -1166,9 +1166,9 @@ mw_calendar_day_selected_cb (AlmanahCalendarButton *calendar_button, AlmanahMain
#ifdef ENABLE_SPELL_CHECKING
/* Ensure the spell-checking is updated */
- gtkspell = gtkspell_get_from_text_view (priv->entry_view);
+ gtkspell = gtk_spell_checker_get_from_text_view (priv->entry_view);
if (gtkspell != NULL) {
- gtkspell_recheck_all (gtkspell);
+ gtk_spell_checker_recheck_all (gtkspell);
gtk_widget_queue_draw (GTK_WIDGET (priv->entry_view));
}
#endif /* ENABLE_SPELL_CHECKING */
@@ -1326,13 +1326,13 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error)
{
AlmanahApplication *application;
GSettings *settings;
- GtkSpell *gtkspell;
+ GtkSpellChecker *gtkspell;
gchar *spelling_language;
GtkTextTagTable *table;
GtkTextTag *tag;
/* Bail out if spell checking's already enabled */
- if (gtkspell_get_from_text_view (self->priv->entry_view) != NULL)
+ if (gtk_spell_checker_get_from_text_view (self->priv->entry_view) != NULL)
return TRUE;
/* If spell checking wasn't already enabled, we have a dummy gtkspell-misspelled text tag to destroy */
@@ -1353,7 +1353,9 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error)
spelling_language = NULL;
}
- gtkspell = gtkspell_new_attach (self->priv->entry_view, spelling_language, error);
+ gtkspell = gtk_spell_checker_new ();
+ gtk_spell_checker_set_language (gtkspell, spelling_language, error);
+ gtk_spell_checker_attach (gtkspell, self->priv->entry_view);
g_free (spelling_language);
if (gtkspell == NULL)
@@ -1364,13 +1366,13 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error)
static void
disable_spell_checking (AlmanahMainWindow *self)
{
- GtkSpell *gtkspell;
+ GtkSpellChecker *gtkspell;
GtkTextTagTable *table;
GtkTextTag *tag;
- gtkspell = gtkspell_get_from_text_view (self->priv->entry_view);
+ gtkspell = gtk_spell_checker_get_from_text_view (self->priv->entry_view);
if (gtkspell != NULL)
- gtkspell_detach (gtkspell);
+ gtk_spell_checker_detach (gtkspell);
/* Remove the old gtkspell-misspelling text tag */
table = gtk_text_buffer_get_tag_table (self->priv->entry_buffer);
--
cgit v0.9.1
|
