diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2017-02-11 08:36:57 +0000 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2017-02-18 19:16:41 +0000 |
| commit | ae6b22248e9be6549ceefa791d83a85d4675d151 (patch) | |
| tree | 40d9ffd7505b827767b6715f6d9baea4f38f9d99 | |
| parent | 343582102da129599654eaab944c24a3201a921a (diff) | |
| download | enchant-ae6b22248e9be6549ceefa791d83a85d4675d151.tar.gz | |
Remove Windows-specific prefix finding code, and obsolete OpenOffice dictionary finder
| -rw-r--r-- | src/enchant.c | 19 | ||||
| -rw-r--r-- | src/myspell/myspell_checker.cpp | 8 |
2 files changed, 0 insertions, 27 deletions
diff --git a/src/enchant.c b/src/enchant.c index 164e60a..6f4eb0b 100644 --- a/src/enchant.c +++ b/src/enchant.c @@ -2052,25 +2052,6 @@ enchant_get_prefix_dir(void) } } -#ifdef _WIN32 - if (!prefix) { - /* Dynamically locate library and return containing directory */ - WCHAR dll_path[MAX_PATH]; - - if(GetModuleFileNameW(s_hModule,dll_path,MAX_PATH)) - { - gchar* utf8_dll_path = g_utf16_to_utf8 (dll_path, -1, NULL, NULL, NULL); - prefix = g_path_get_dirname(utf8_dll_path); - g_free(utf8_dll_path); - /* Strip off "bin" subfolder if present */ - if (strlen(prefix) >=6 && - G_IS_DIR_SEPARATOR(prefix[strlen(prefix)-4]) && - g_ascii_strcasecmp(prefix+strlen(prefix)-3, "bin") == 0) - prefix[strlen(prefix)-4] = '\0'; - } - } -#endif - #if defined(ENCHANT_PREFIX_DIR) if (!prefix) { prefix = g_strdup (ENCHANT_PREFIX_DIR); diff --git a/src/myspell/myspell_checker.cpp b/src/myspell/myspell_checker.cpp index df9683e..d04a726 100644 --- a/src/myspell/myspell_checker.cpp +++ b/src/myspell/myspell_checker.cpp @@ -211,14 +211,6 @@ myspell_checker_get_dictionary_dirs (EnchantBroker * broker) dirs = g_slist_append (dirs, g_strdup (ENCHANT_MYSPELL_DICT_DIR)); #endif -#if defined(_WIN32) - char* open_office_dicts_dir = myspell_checker_get_open_office_dicts_dir (); - if (open_office_dicts_dir) - { - dirs = g_slist_append (dirs, open_office_dicts_dir); - } -#endif - { GSList *config_dirs, *iter; |