talons

commit 501ee37ccbf81bbaa8bdfcc3d18ac3e7198364f1
parent 735d40a92f87e17fe1c98c7c36279d467c536809
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Sat,  5 Nov 2011 14:19:33 +0000

2011-11-05 [pawel]	3.7.10cvs70

	* src/gtk/gtkaspell.c
		Fix crasher when spellchecking is not enabled

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/gtkaspell.c
 | 
12
++++++++++--

4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-05 [pawel]	3.7.10cvs70
+
+	* src/gtk/gtkaspell.c
+		Fix crasher when spellchecking is not enabled
+
 2011-11-02 [mones]	3.7.10cvs69
 
 	* doc/man/claws-mail.1
diff --git a/PATCHSETS b/PATCHSETS
@@ -4273,3 +4273,4 @@
 ( cvs diff -u -r 1.382.2.591 -r 1.382.2.592 src/compose.c;  cvs diff -u -r 1.115.2.243 -r 1.115.2.244 src/main.c;  cvs diff -u -r 1.36.2.193 -r 1.36.2.194 src/common/utils.c;  cvs diff -u -r 1.9.2.73 -r 1.9.2.74 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/gtk/gtkaspell.h;  ) > 3.7.10cvs67.patchset
 ( cvs diff -u -r 1.36.2.194 -r 1.36.2.195 src/common/utils.c;  ) > 3.7.10cvs68.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 doc/man/claws-mail.1;  ) > 3.7.10cvs69.patchset
+( cvs diff -u -r 1.9.2.74 -r 1.9.2.75 src/gtk/gtkaspell.c;  ) > 3.7.10cvs70.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=69
+EXTRA_VERSION=70
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
@@ -1190,7 +1190,11 @@ static void replace_word_cb(GtkWidget *w, gpointer data)
 
 void gtkaspell_block_check(GtkAspell *gtkaspell)
 {
-	GtkTextView *gtktext = gtkaspell->gtktext;
+	GtkTextView *gtktext;
+	
+	cm_return_if_fail(gtkaspell);
+		
+	gtktext = gtkaspell->gtktext;
 	g_signal_handlers_block_by_func(G_OBJECT(gtktext),
 					 G_CALLBACK(entry_insert_cb),
 					 gtkaspell);
@@ -1201,7 +1205,11 @@ void gtkaspell_block_check(GtkAspell *gtkaspell)
 
 void gtkaspell_unblock_check(GtkAspell *gtkaspell)
 {
-	GtkTextView *gtktext = gtkaspell->gtktext;
+	GtkTextView *gtktext;
+
+	cm_return_if_fail(gtkaspell);
+		
+	gtktext = gtkaspell->gtktext;
 	g_signal_handlers_unblock_by_func(G_OBJECT(gtktext),
 					 G_CALLBACK(entry_insert_cb),
 					 gtkaspell);