diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2017-02-04 19:14:33 +0000 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2017-02-09 00:28:24 +0000 |
| commit | c65510f73ca441add000e919d588a5b625103dd9 (patch) | |
| tree | 08fed4acaf880a2c41a88fa4f33d0a06bd2a8ba5 | |
| parent | edf662a5ec8db85aa6e5a5d00531ab6b8773131f (diff) | |
| download | enchant-c65510f73ca441add000e919d588a5b625103dd9.tar.gz | |
Stop supporting old glib
| -rw-r--r-- | src/pwl.c | 21 | ||||
| -rw-r--r-- | src/zemberek/zemberek.cpp | 7 |
2 files changed, 0 insertions, 28 deletions
@@ -66,10 +66,6 @@ #include "pwl.h" -#if defined(_MSC_VER) -#pragma warning(disable: 4996) /* The POSIX name for this item is deprecated. Instead, use the ISO C++ conformant name. */ -#endif - #define ENCHANT_PWL_MAX_ERRORS 3 #define ENCHANT_PWL_MAX_SUGGS 15 @@ -852,23 +848,6 @@ static EnchantTrie* enchant_trie_insert(EnchantTrie* trie,const char *const word return trie; } -#if !GLIB_CHECK_VERSION(2,14,0) -static void grab_keys (gpointer key, - gpointer value, - gpointer user_data) -{ - GList **l = user_data; - *l = g_list_prepend (*l, key); -} - -static GList* g_hash_table_get_keys (GHashTable *hash_table) -{ - GList *l = NULL; - g_hash_table_foreach (hash_table, grab_keys, &l); - return l; -} -#endif - static void enchant_trie_remove(EnchantTrie* trie,const char *const word) { char *tmpWord; diff --git a/src/zemberek/zemberek.cpp b/src/zemberek/zemberek.cpp index 0eaff55..521a204 100644 --- a/src/zemberek/zemberek.cpp +++ b/src/zemberek/zemberek.cpp @@ -33,11 +33,7 @@ bool zemberek_service_is_running () { DBusGConnection *connection; DBusGProxy *proxy; - GError *Error = NULL; -#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init (); -#endif connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &Error); @@ -64,9 +60,6 @@ Zemberek::Zemberek() : connection(NULL), proxy(NULL) { GError *Error = NULL; -#if !GLIB_CHECK_VERSION(2,35,0) - g_type_init (); -#endif connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &Error); |