2008-09-21 [colin] 3.5.0cvs121

	* src/gtk/gtkaspell.c
		Don't try to use empty dictionaries

diff --git a/ChangeLog b/ChangeLog
index cc5c4787c1a5c914680ddfd9d511d66b911c3658..5e894fa35605403840fbc8015c97e8924098bfb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-21 [colin]     3.5.0cvs121
+
+       * src/gtk/gtkaspell.c
+               Don't try to use empty dictionaries
+
 2008-09-20 [colin]     3.5.0cvs120
 
        * po/POTFILES.in

diff --git a/PATCHSETS b/PATCHSETS
index 67a84233492382f84dc1f118d4f95ee3c8671687..001c20120290cb14f72750c3392ccbfe42ef89f1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3532,3 +3532,4 @@
 ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/autofaces.c;  cvs diff -u -r 1.382.2.477 -r 1.382.2.478 src/compose.c;  cvs diff -u -r 1.3.2.28 -r 1.3.2.29 src/ldapquery.c;  cvs diff -u -r 1.115.2.205 -r 1.115.2.206 src/main.c;  cvs diff -u -r 1.101.2.54 -r 1.101.2.55 src/news.c;  cvs diff -u -r 1.13.2.38 -r 1.13.2.39 src/common/socket.c;  cvs diff -u -r 1.5.2.83 -r 1.5.2.84 src/gtk/gtkutils.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/claws.def;  ) > 3.5.0cvs118.patchset
 ( cvs diff -u -r 1.8.2.7 -r 1.8.2.8 src/plugins/Makefile.am;  diff -u /dev/null src/plugins/smime/Makefile.am;  diff -u /dev/null src/plugins/smime/plugin.c;  diff -u /dev/null src/plugins/smime/smime.c;  diff -u /dev/null src/plugins/smime/smime.deps;  diff -u /dev/null src/plugins/smime/smime.h;  ) > 3.5.0cvs119.patchset
 ( cvs diff -u -r 1.53.2.34 -r 1.53.2.35 po/POTFILES.in;  ) > 3.5.0cvs120.patchset
+( cvs diff -u -r 1.9.2.63 -r 1.9.2.64 src/gtk/gtkaspell.c;  ) > 3.5.0cvs121.patchset

diff --git a/configure.ac b/configure.ac
index 9c8a273c021a49f036773d2d927c29d2fcbcd122..0348a5fee0782f4343b7387b1a023c86b72f90ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=120
+EXTRA_VERSION=121
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index 1f62bc34eccd0ba1a52096754c3af7e9803647fe..2c716e117b8d664a5a4e8947f5080374f7e09a1d 100644 (file)
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -2068,6 +2068,10 @@ gboolean gtkaspell_change_dict(GtkAspell *gtkaspell, const gchar *dictionary,
                *(strchr(dict->dictname, '-')) = '\0';
        }
 
+       if (!dict->fullname || !(*dict->fullname)) {
+               dictionary_delete(dict);
+               return FALSE;
+       }
        gtkaspeller = gtkaspeller_new(dict);
 
        if (!gtkaspeller) {
@@ -2119,6 +2123,11 @@ gboolean gtkaspell_change_alt_dict(GtkAspell *gtkaspell, const gchar *alt_dictio
                *(strchr(dict->dictname, '-')) = '\0';
        }
 
+       if (!dict->fullname || !(*dict->fullname)) {
+               dictionary_delete(dict);
+               return FALSE;
+       }
+
        gtkaspeller = gtkaspeller_new(dict);
 
        if (!gtkaspeller) {