From 8efc34ab4e30a999b80804c8a535d7903c87e511 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 28 Dec 2006 18:19:55 +0000 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/gtkaspell.c | 7 ++----- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c5af031a..d73b05506 100644 --- 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 diff --git a/PATCHSETS b/PATCHSETS index ca8f2860a..cb3c9ad48 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2194,3 +2194,4 @@ ( 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 diff --git a/configure.ac b/configure.ac index be69d75f0..10fe1c403 100644 --- a/configure.ac +++ b/configure.ac @@ -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= diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c index a8154f470..9b9a7ced2 100644 --- a/src/gtk/gtkaspell.c +++ b/src/gtk/gtkaspell.c @@ -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; -- 2.25.1