2013-01-09 [paul] 3.9.0cvs54

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

diff --git a/ChangeLog b/ChangeLog
index adc78ca60023b275c29c41adc6a45d912a690e7f..3148e9c0e6e67739f5f0f6e292c2b8d795a5b35e 100644 (file)
--- 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
 2013-01-09 [mir]       3.9.0cvs53
 
        * tools/vcard2xml.py

diff --git a/PATCHSETS b/PATCHSETS
index 367500a8c525c78127a8088757c6360c2d29b243..145ce9d6143f97321fbeb330f999a989bbea193f 100644 (file)
--- 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.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
index 1ec75a0a64f7740319e63e7aa7a538f58a7e0df6..5fc6e6cbfb6d49faf695e09e837786122f5231ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=53
+EXTRA_VERSION=54

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index fce20c4bc3422bde138593bfb4ef81739a06249b..c88cab4214c389610d034ca3122e879dc1075367 100644 (file)
--- 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.
 /* 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
  *
  * 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)
 {
 
 static GSList *populate_submenu(GtkAspell *gtkaspell)
 {

-       GtkWidget *item, *submenu;
+       GtkWidget *item, *submenu, *both_dicts_item;

        gchar *dictname;
        GtkAspeller *gtkaspeller = NULL;
        GSList *list = NULL;
        gchar *dictname;
        GtkAspeller *gtkaspeller = NULL;
        GSList *list = NULL;


@@ -2034,15 +2035,17 @@ static GSList *populate_submenu(GtkAspell *gtkaspell)
                list = g_slist_append(list, item);
        }
 
                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);
                         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);
        
        item = gtk_menu_item_new();
         gtk_widget_show(item);