From: Colin Leroy <colin@colino.net>
Date: Thu, 2 Sep 2004 07:17:55 +0000 (+0000)
Subject: 2004-09-02 [colin]	0.9.12cvs87
X-Git-Tag: rel_0_9_12b~20
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=ecd123c09baebb5713eaee188b3b57125e69aed6;ds=sidebyside

2004-09-02 [colin]	0.9.12cvs87

	* src/prefs_spelling.c
		Fix bug with aspell prefs init, where spell checking
		is enabled at first but dictionary not specified. Use
		LANG's dictionary by default.
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3d3fee73d..23235992c 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2004-09-02 [colin]	0.9.12cvs87
+
+	* src/prefs_spelling.c
+		Fix bug with aspell prefs init, where spell checking
+		is enabled at first but dictionary not specified. Use
+		LANG's dictionary by default.
+
 2004-09-01 [colin]	0.9.12cvs86
 
 	* src/filtering.c
diff --git a/PATCHSETS b/PATCHSETS
index 510e84674..b8d72a0ac 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -69,3 +69,4 @@
 ( cvs diff -u -r 1.124 -r 1.125 src/mimeview.c; ) > 0.9.12cvs84.patchset
 ( cvs diff -u -r 1.257 -r 1.258 src/folder.c; ) > 0.9.12cvs85.patchset
 ( cvs diff -u -r 1.70 -r 1.71 src/filtering.c; cvs diff -u -r 1.206 -r 1.207 src/imap.c; cvs diff -u -r 1.47 -r 1.48 src/prefs_matcher.c; cvs diff -u -r 1.35 -r 1.36 src/stock_pixmap.c; ) > 0.9.12cvs86.patchset
+( cvs diff -u -r 1.6 -r 1.7 src/prefs_spelling.c; ) > 0.9.12cvs87.patchset
diff --git a/configure.ac b/configure.ac
index 0701b2310..3a34b17be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=86
+EXTRA_VERSION=87
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
diff --git a/src/prefs_spelling.c b/src/prefs_spelling.c
index 3577ce29f..21e610117 100644
--- a/src/prefs_spelling.c
+++ b/src/prefs_spelling.c
@@ -371,6 +371,20 @@ void prefs_spelling_init(void)
 
 	prefs_gtk_register_page((PrefsPage *) page);
 	prefs_spelling = page;
+
+	if (!prefs_common.dictionary)
+		prefs_common.dictionary = g_strdup_printf("%s%s",
+						prefs_common.aspell_path,
+						g_getenv("LANG"));
+	if (!strlen(prefs_common.dictionary)
+	||  !strcmp(prefs_common.dictionary,"(None"))
+		prefs_common.dictionary = g_strdup_printf("%s%s",
+						prefs_common.aspell_path,
+						g_getenv("LANG"));
+	if (strcasestr(prefs_common.dictionary,".utf"))
+		*(strcasestr(prefs_common.dictionary,".utf")) = '\0';
+	if (strstr(prefs_common.dictionary,"@"))
+		*(strstr(prefs_common.dictionary,"@")) = '\0';
 }
 
 void prefs_spelling_done(void)