pidgin: ababcf08: We're not going to support aspell dictio...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: ababcf08713b8c5b782db2d8c6e804e7b5a4f306
Ancestor: 0db9450bd0635960beb30af3fc46c9a7a71921d4
Author: datallah at pidgin.im
Date: 2010-03-15T22:00:43
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ababcf08713b8c5b782db2d8c6e804e7b5a4f306

Modified files:
        ChangeLog.win32 pidgin/win32/winpidgin.c
        pidgin/win32/wspell.c

ChangeLog: 

We're not going to support aspell dictionaries on Windows anymore.

-------------- next part --------------
============================================================
--- ChangeLog.win32	d62aa65c3fb6251daa896a722e43d3013bda8cee
+++ ChangeLog.win32	017660602098d961dfc50a6d72f68e4e97a92ee0
@@ -7,8 +7,8 @@ version 2.7.0 (??/??/????):
 	  directory instead of the installation directory.
 	* NSS SSL Library upgraded to 3.12.5 (thanks to Berke Viktor)
 	* GtkSpell upgraded to 2.0.16, changing the spellchecking backend to
-	  enchant.  This means that myspell, hunspell (OpenOffice) and existing
-	  aspell dictionaries can be used.
+	  enchant.  This means that myspell and hunspell (OpenOffice)
+	  dictionaries can be used (previously used aspell dictionaries won't).
 
 version 2.6.6 (02/18/2010):
 	* Installer translations for: Norwegian nynorsk
============================================================
--- pidgin/win32/winpidgin.c	f36fa4579ed831bb4c17f44955bda1fdd86fa5c7
+++ pidgin/win32/winpidgin.c	46d6fa0233538fc33b4a8fbab84dac4e3d14db69
@@ -198,9 +198,9 @@ static void portable_mode_dll_prep(const
 }
 
 static void portable_mode_dll_prep(const wchar_t *pidgin_dir) {
-	/* need to be able to fit MAX_PATH + "PIDGIN_ASPELL_DIR=\\Aspell\\bin" in path2 */
+	/* need to be able to fit MAX_PATH + "PURPLEHOME=" in path2 */
 	wchar_t path[MAX_PATH + 1];
-	wchar_t path2[MAX_PATH + 33];
+	wchar_t path2[MAX_PATH + 12];
 	const wchar_t *prev = NULL;
 
 	/* We assume that GTK+ is installed under \\path\to\Pidgin\..\GTK
@@ -231,10 +231,6 @@ static void portable_mode_dll_prep(const
 	wprintf(L"Setting settings dir: %s\n", path2);
 	_wputenv(path2);
 
-	_snwprintf(path2, sizeof(path2) / sizeof(wchar_t), L"PIDGIN_ASPELL_DIR=%s\\Aspell\\bin", path);
-	wprintf(L"%s\n", path2);
-	_wputenv(path2);
-
 	if (!dll_prep(pidgin_dir)) {
 		/* set the GTK+ path to be \\path\to\GTK\bin */
 		wcscat(path, L"\\GTK\\bin");
============================================================
--- pidgin/win32/wspell.c	4a290ff61ae0543684fd7e04eac3bf51298e5f13
+++ pidgin/win32/wspell.c	364332a808025855aae34eed182727f88408d6f3
@@ -95,41 +95,6 @@ static void load_gtkspell() {
 	SetErrorMode(old_error_mode);
 }
 
-static void lookup_aspell_path() {
-	const char *tmp;
-	gchar *aspell_path;
-
-	if ((tmp = g_getenv("PIDGIN_ASPELL_DIR")))
-		aspell_path = g_strdup(tmp);
-	else
-		aspell_path = wpurple_read_reg_string(HKEY_LOCAL_MACHINE, "Software\\Aspell", "Path");
-
-	if (aspell_path != NULL) {
-		char *tmp = g_build_filename(aspell_path, "aspell-15.dll", NULL);
-		if (g_file_test(tmp, G_FILE_TEST_EXISTS)) {
-			const char *path = g_getenv("PATH");
-			purple_debug_info("wspell", "Found Aspell in %s\n", aspell_path);
-
-			g_free(tmp);
-
-			tmp = g_strdup_printf("%s%s%s", (path ? path : ""),
-					(path ? G_SEARCHPATH_SEPARATOR_S : ""),
-					aspell_path);
-
-			g_setenv("PATH", tmp, TRUE);
-
-		} else
-			purple_debug_warning("wspell", "Couldn't find aspell-15.dll\n");
-
-		g_free(tmp);
-		g_free(aspell_path);
-	} else
-		purple_debug_warning("wspell", "Aspell installation not found (this isn't necessarily a problem)\n");
-}
-
 void winpidgin_spell_init() {
-	/* We keep doing the aspell path thing so that previously installed dictionaries still work */
-	lookup_aspell_path();
-
 	load_gtkspell();
 }