[GeanyVC] use compatible gtkspell on building for gtk3

[sagarchalise]

When building against gtk3 the gtkspell support was missing for geanyvc plugin commit dialog box.

[frlan]

I'm afraid build is failing here

geanyvc.c: In function 'vccommit_activated':
geanyvc.c:1536:2: error: unknown type name 'GtkSpellChecker'
  GtkSpellChecker *speller = NULL;
  ^
geanyvc.c:1598:17: warning: assignment from incompatible pointer type [-Wincompatible-pointer-types]
         speller = gtkspell_new_attach(GTK_TEXT_VIEW(messageView), NULL, &spellcheck_error);
                 ^
geanyvc.c:1612:34: warning: passing argument 1 of 'gtkspell_set_language' from incompatible pointer type [-Wincompatible-pointer-types]
   gtk_spell_checker_set_language(speller, lang, &spellcheck_error);
                                  ^
In file included from geanyvc.c:41:0:
/usr/include/gtkspell-2.0/gtkspell/gtkspell.h:34:11: note: expected 'GtkSpell * {aka struct _GtkSpell *}' but argument is of type 'int *'
 gboolean  gtkspell_set_language(GtkSpell *spell,
           ^

[b4n]

Works for me after the mentioned fix.

[b4n]

comment is not very useful, but I agree adding compat layer for older version rather than newer

[b4n]

If we wanted a simpler/less intrusive port, we could just do

diff --git a/geanyvc/src/geanyvc.c b/geanyvc/src/geanyvc.c
index a95a991..488f1f2 100644
--- a/geanyvc/src/geanyvc.c
+++ b/geanyvc/src/geanyvc.c
@@ -39,6 +39,25 @@

 #ifdef USE_GTKSPELL
 #include <gtkspell/gtkspell.h>
+/* forward compatibility with GtkSpell3 */
+#      if GTK_CHECK_VERSION(3, 0, 0)
+#              define GtkSpell GtkSpellChecker
+#              define gtkspell_set_language gtk_spell_checker_set_language
+static GtkSpell *gtkspell_new_attach(GtkTextView *view, const gchar *lang, GError **error)
+{
+       GtkSpellChecker *speller = gtk_spell_checker_new();
+
+       if (! lang || gtk_spell_checker_set_language(speller, lang, error))
+               gtk_spell_checker_attach(speller, view);
+       else
+       {
+               g_object_unref(g_object_ref_sink(speller));
+               speller = NULL;
+       }
+
+       return speller;
+}
+#      endif
 #endif

 GeanyData *geany_data;

in the code, and just keep the build system changes from this PR, which are just fine.

[edit: fixed unref with regard to floating ref]

[sagarchalise]

Sorry about the typo. Have made changes according to suggestions made by @b4n .

[b4n]

Indentation style is incorrect in geanyvc.c (should use tabs (with width=4), like the rest of the file). Commits should be squashed.
I can do both when merging this if you like.

Apart that, looks good and seems to work fine on both GTK2 and 3. BTW, good job simplifying the error handling that indeed was unnecessarily complex :)

[sagarchalise]

@b4n Do whatever you consider necessary. Also, I guess the error message should have something about GeanyVC as user may misunderstand it to be message of spell check plugin. Something like

• Error initializing spell checking for geanyvc:
  or
• [GeanyVC] Error initializing spell checking:

[b4n]

@b4n Do whatever you consider necessary.

Okay, done, committed as 57e0cd0.

Also, I guess the error message should have something about GeanyVC as user may misunderstand it to be message of spell check plugin. […]

Good point. Done in a788c31