2006-12-28 [colin] 2.6.1cvs87
authorColin Leroy <colin@colino.net>
Thu, 28 Dec 2006 18:19:55 +0000 (18:19 +0000)
committerColin Leroy <colin@colino.net>
Thu, 28 Dec 2006 18:19:55 +0000 (18:19 +0000)
* src/gtk/gtkaspell.c
Don't assert if use_alternate is true
and alt_dictionary isn't set -- this
is what happens on upgrade! Rather,
do with it.

ChangeLog
PATCHSETS
configure.ac
src/gtk/gtkaspell.c

index 6c5af031ac90a68677c1bdeb334b565c2ed8173a..d73b05506a05b5e79f576e3f6eb89793c263b20f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-28 [colin]     2.6.1cvs87
+
+       * src/gtk/gtkaspell.c
+               Don't assert if use_alternate is true
+               and alt_dictionary isn't set -- this 
+               is what happens on upgrade! Rather,
+               do with it.
+
 2006-12-28 [colin]     2.6.1cvs86
 
        * Makefile.am
index ca8f2860a5ceaef8dcecf878b5512ed1064510ab..cb3c9ad4835bde4c86d87cdd02e2f381531e831f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pgpmime/claws.def;  ) > 2.6.1cvs84.patchset
 ( cvs diff -u -r 1.24.2.18 -r 1.24.2.19 Makefile.am;  ) > 2.6.1cvs85.patchset
 ( cvs diff -u -r 1.24.2.19 -r 1.24.2.20 Makefile.am;  ) > 2.6.1cvs86.patchset
+( cvs diff -u -r 1.9.2.48 -r 1.9.2.49 src/gtk/gtkaspell.c;  ) > 2.6.1cvs87.patchset
index be69d75f0f802fbb393f18a35ae2ec90a23d36ef..10fe1c40341868a3478bd022bdc99dac851d0922 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=86
+EXTRA_VERSION=87
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index a8154f47074680c12f6e12414c97e9a3793e05bc..9b9a7ced26f04c81e1919fa2a7bfa6c1150e56e7 100644 (file)
@@ -396,10 +396,7 @@ GtkAspell *gtkaspell_new(const gchar *dictionary_path,
        g_return_val_if_fail(gtktext, NULL);
        g_return_val_if_fail(dictionary && strlen(dictionary) > 0, 
                        NULL);
-       if (use_alternate) {
-               g_return_val_if_fail(alt_dictionary && strlen(alt_dictionary) > 0, 
-                               NULL);
-       }
+
        g_return_val_if_fail(dictionary_path && strlen(dictionary_path) > 0, 
                        NULL);
 
@@ -421,7 +418,7 @@ GtkAspell *gtkaspell_new(const gchar *dictionary_path,
 
        gtkaspell->gtkaspeller        = gtkaspeller;
 
-       if (use_alternate) {
+       if (use_alternate && alt_dictionary && *alt_dictionary) {
                Dictionary      *alt_dict;
                GtkAspeller     *alt_gtkaspeller;