From a55165db992b5a464fc988d7152e771294bebbbe Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 8 Feb 2018 18:55:39 +0100
Subject: [PATCH] Hide enchant dependency from public headers

There is no real need to expose the dependency and with the change
of the enachant version it could be problematic to forward the right
enchant include folder to the library user, thus it's easier to just
hide the dependency.
---
 src/e-util/e-spell-checker.c    | 4 +++-
 src/e-util/e-spell-checker.h    | 3 ++-
 src/e-util/e-spell-dictionary.c | 4 +++-
 src/e-util/e-spell-dictionary.h | 3 +--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/e-util/e-spell-checker.c b/src/e-util/e-spell-checker.c
index fc5a0ff8b4..5ae1fa66a4 100644
--- a/src/e-util/e-spell-checker.c
+++ b/src/e-util/e-spell-checker.c
@@ -18,6 +18,8 @@
 
 #include "evolution-config.h"
 
+#include <enchant.h>
+
 #include "e-spell-checker.h"
 #include "e-spell-dictionary.h"
 
@@ -386,7 +388,7 @@ e_spell_checker_ref_dictionary (ESpellChecker *checker,
  *
  * Returns: the #EnchantDict for @language_code, or %NULL
  **/
-EnchantDict *
+gpointer
 e_spell_checker_get_enchant_dict (ESpellChecker *checker,
                                   const gchar *language_code)
 {
diff --git a/src/e-util/e-spell-checker.h b/src/e-util/e-spell-checker.h
index 690401b8f9..76bac68dcc 100644
--- a/src/e-util/e-spell-checker.h
+++ b/src/e-util/e-spell-checker.h
@@ -71,7 +71,8 @@ guint		e_spell_checker_count_available_dicts
 ESpellDictionary *
 		e_spell_checker_ref_dictionary	(ESpellChecker *checker,
 						 const gchar *language_code);
-EnchantDict *	e_spell_checker_get_enchant_dict
+gpointer /* EnchantDict * */
+		e_spell_checker_get_enchant_dict
 						(ESpellChecker *checker,
 						 const gchar *language_code);
 gboolean	e_spell_checker_get_language_active
diff --git a/src/e-util/e-spell-dictionary.c b/src/e-util/e-spell-dictionary.c
index f4f8db920d..a9e51f7f6e 100644
--- a/src/e-util/e-spell-dictionary.c
+++ b/src/e-util/e-spell-dictionary.c
@@ -18,6 +18,8 @@
 
 #include "evolution-config.h"
 
+#include <enchant.h>
+
 #include "e-util-private.h"
 #include "e-spell-dictionary.h"
 #include "e-spell-checker.h"
@@ -437,7 +439,7 @@ e_spell_dictionary_init (ESpellDictionary *dictionary)
 
 ESpellDictionary *
 e_spell_dictionary_new (ESpellChecker *spell_checker,
-                        EnchantDict *enchant_dict)
+                        gpointer enchant_dict)
 {
 	ESpellDictionary *dictionary;
 
diff --git a/src/e-util/e-spell-dictionary.h b/src/e-util/e-spell-dictionary.h
index 83b0fc43ac..1bf1bfa251 100644
--- a/src/e-util/e-spell-dictionary.h
+++ b/src/e-util/e-spell-dictionary.h
@@ -24,7 +24,6 @@
 #define E_SPELL_DICTIONARY_H
 
 #include <glib-object.h>
-#include <enchant.h>
 
 /* Standard GObject macros */
 #define E_TYPE_SPELL_DICTIONARY \
@@ -66,7 +65,7 @@ struct _ESpellDictionaryClass {
 GType		e_spell_dictionary_get_type	(void) G_GNUC_CONST;
 ESpellDictionary *
 		e_spell_dictionary_new		(struct _ESpellChecker *spell_checker,
-						 EnchantDict *enchant_dict);
+						 gpointer enchant_dict); /* EnchantDict * */
 ESpellDictionary *
 		e_spell_dictionary_new_bare	(struct _ESpellChecker *spell_checker,
 						 const gchar *language_tag);