talons

commit 3b797b4cbf3557e527182ef0a1821d90b325ddcc
parent 8234fe118bf1e2aef4501cdcde79e31c0ed19dcd
Author: Paul Mangan <paul@claws-mail.org>
Date:   Wed,  9 Jan 2013 11:50:38 +0000

2013-01-09 [paul]	3.9.0cvs54

	* src/gtk/gtkaspell.c
		fix sensitivity of 'Use both dictionaries' in compose window

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

4 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-09 [paul]	3.9.0cvs54
+
+	* src/gtk/gtkaspell.c
+		fix sensitivity of 'Use both dictionaries' in compose window
+
 2013-01-09 [mir]	3.9.0cvs53
 
 	* tools/vcard2xml.py
diff --git a/PATCHSETS b/PATCHSETS
@@ -4551,3 +4551,4 @@
 ( cvs diff -u -r 1.12.2.79 -r 1.12.2.80 src/action.c;  ) > 3.9.0cvs51.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 claws-mail.desktop;  ) > 3.9.0cvs52.patchset
 ( cvs diff -u -r 1.1.4.6 -r 1.1.4.7 tools/vcard2xml.py;  ) > 3.9.0cvs53.patchset
+( cvs diff -u -r 1.9.2.83 -r 1.9.2.84 src/gtk/gtkaspell.c;  ) > 3.9.0cvs54.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=53
+EXTRA_VERSION=54
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
@@ -1,6 +1,7 @@
 /* gtkaspell - a spell-checking addon for GtkText
  * Copyright (c) 2000 Evan Martin (original code for ispell).
  * Copyright (c) 2002 Melvin Hadasht.
+ * Copyright (C) 2001-2013 the Claws Mail Team
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -1999,7 +2000,7 @@ static GSList *make_sug_menu(GtkAspell *gtkaspell)
 
 static GSList *populate_submenu(GtkAspell *gtkaspell)
 {
-	GtkWidget *item, *submenu;
+	GtkWidget *item, *submenu, *both_dicts_item;
 	gchar *dictname;
 	GtkAspeller *gtkaspeller = NULL;
 	GSList *list = NULL;
@@ -2034,15 +2035,17 @@ static GSList *populate_submenu(GtkAspell *gtkaspell)
 		list = g_slist_append(list, item);
 	}
 
-	item = gtk_check_menu_item_new_with_label(_("Use both dictionaries"));
-	if (gtkaspell->use_both_dicts) {
-		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), TRUE);
+	both_dicts_item = gtk_check_menu_item_new_with_label(_("Use both dictionaries"));
+	if (gtkaspell->use_both_dicts && gtkaspell->use_alternate) {
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(both_dicts_item), TRUE);
 	} 
-	g_signal_connect(G_OBJECT(item), "activate",
+	gtk_widget_set_sensitive(both_dicts_item, gtkaspell->use_alternate);
+	
+	g_signal_connect(G_OBJECT(both_dicts_item), "activate",
 			 G_CALLBACK(set_use_both_cb),
 			 gtkaspell);
-	gtk_widget_show(item);
-	list = g_slist_append(list, item);
+	gtk_widget_show(both_dicts_item);
+	list = g_slist_append(list, both_dicts_item);
 	
 	item = gtk_menu_item_new();
         gtk_widget_show(item);