|
0 |
From cf33d8761dbfc7f6c8b27c3146efcad81f8fbde9 Mon Sep 17 00:00:00 2001
|
|
1 |
From: Kalev Lember <kalevlember@gmail.com>
|
|
2 |
Date: Sun, 13 Jan 2013 13:19:40 +0000
|
|
3 |
Subject: Port to gtkspell3
|
|
4 |
|
|
5 |
https://bugzilla.gnome.org/show_bug.cgi?id=691655
|
|
6 |
---
|
|
7 |
diff --git a/configure.ac b/configure.ac
|
|
8 |
index c1ba5b6..3fe9c46 100644
|
|
9 |
--- a/configure.ac
|
|
10 |
+++ b/configure.ac
|
|
11 |
@@ -84,7 +84,7 @@ GDL_REQUIRED=3.6.0
|
|
12 |
GDA_REQUIRED=4.2.3
|
|
13 |
PEAS_REQUIRED=1.2.0
|
|
14 |
GDICT_OPTIONAL=0.11.0
|
|
15 |
-GTKSPELL_OPTIONAL=2.99.99
|
|
16 |
+GTKSPELL_OPTIONAL=3.0.0
|
|
17 |
JSON_GLIB_OPTIONAL=0.12.0
|
|
18 |
|
|
19 |
AC_ARG_WITH(gda,
|
|
20 |
@@ -174,14 +174,14 @@ dnl -------------------------------------------------------------------
|
|
21 |
dnl Check for gtkspell >= 3.0 and use it if found
|
|
22 |
dnl -------------------------------------------------------------------
|
|
23 |
have_gtkspell=no
|
|
24 |
-AC_ARG_WITH(gtkspell3,
|
|
25 |
+AC_ARG_WITH(gtkspell,
|
|
26 |
AS_HELP_STRING([--with-gtkspell],[Build with spell support]),,
|
|
27 |
with_gtkspell=auto)
|
|
28 |
|
|
29 |
if test x"$with_gtkspell" != "xno"
|
|
30 |
then
|
|
31 |
PKG_CHECK_MODULES([GTKSPELL], [
|
|
32 |
- gtkspell-3.0 >= $GTKSPELL_OPTIONAL
|
|
33 |
+ gtkspell3-3.0 >= $GTKSPELL_OPTIONAL
|
|
34 |
], have_gtkspell=yes, have_gtkspell=no)
|
|
35 |
|
|
36 |
if test x"$have_gtkspell" = "xyes"
|
|
37 |
@@ -339,7 +339,7 @@ if [ test x"$have_gtkspell" = "xyes" ]; then
|
|
38 |
echo "Building spell support: ................................YES"
|
|
39 |
else
|
|
40 |
echo "Building spell support: ................................NO"
|
|
41 |
- echo " Requires gtkspell >= $GTKSPELL_OPTIONAL"
|
|
42 |
+ echo " Requires gtkspell3 >= $GTKSPELL_OPTIONAL"
|
|
43 |
fi
|
|
44 |
|
|
45 |
echo "
|
|
46 |
diff --git a/src/gtr-view.c b/src/gtr-view.c
|
|
47 |
index 59f18e8..b9c4f6a 100644
|
|
48 |
--- a/src/gtr-view.c
|
|
49 |
+++ b/src/gtr-view.c
|
|
50 |
@@ -65,7 +65,7 @@ struct _GtrViewPrivate
|
|
51 |
gchar *search_text;
|
|
52 |
|
|
53 |
#ifdef HAVE_GTKSPELL
|
|
54 |
- GtkSpell *spell;
|
|
55 |
+ GtkSpellChecker *spell;
|
|
56 |
#endif
|
|
57 |
};
|
|
58 |
|
|
59 |
@@ -75,11 +75,10 @@ gtr_attach_gtkspell (GtrView * view)
|
|
60 |
{
|
|
61 |
GError *error = NULL;
|
|
62 |
gchar *errortext = NULL;
|
|
63 |
- view->priv->spell = NULL;
|
|
64 |
|
|
65 |
- view->priv->spell =
|
|
66 |
- gtkspell_new_attach (GTK_TEXT_VIEW (view), NULL, &error);
|
|
67 |
- if (view->priv->spell == NULL)
|
|
68 |
+ view->priv->spell = gtk_spell_checker_new ();
|
|
69 |
+ gtk_spell_checker_set_language (view->priv->spell, NULL, &error);
|
|
70 |
+ if (error)
|
|
71 |
{
|
|
72 |
g_warning (_("gtkspell error: %s\n"), error->message);
|
|
73 |
errortext =
|
|
74 |
@@ -90,6 +89,11 @@ gtr_attach_gtkspell (GtrView * view)
|
|
75 |
g_error_free (error);
|
|
76 |
g_free (errortext);
|
|
77 |
}
|
|
78 |
+ else
|
|
79 |
+ {
|
|
80 |
+ gtk_spell_checker_attach (view->priv->spell,
|
|
81 |
+ GTK_TEXT_VIEW (view));
|
|
82 |
+ }
|
|
83 |
}
|
|
84 |
#endif
|
|
85 |
|
|
86 |
@@ -263,7 +267,7 @@ gtr_view_enable_spellcheck (GtrView * view, gboolean enable)
|
|
87 |
#ifdef HAVE_GTKSPELL
|
|
88 |
if (!view->priv->spell)
|
|
89 |
return;
|
|
90 |
- gtkspell_detach (view->priv->spell);
|
|
91 |
+ gtk_spell_checker_detach (view->priv->spell);
|
|
92 |
#endif
|
|
93 |
}
|
|
94 |
}
|
|
95 |
--
|
|
96 |
cgit v0.9.1
|