2005-05-17 [colin] 1.9.9cvs9

	* src/gtk/gtkaspell.c
		Fix some accelerators, escape in replace-window

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index d281b7d7f7b7d938308061fe408985f7bd7f369d..fd64f662081f181a5942bdcf6f21774e604c794e 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-05-17 [colin]     1.9.9cvs9
+
+       * src/gtk/gtkaspell.c
+               Fix some accelerators, escape in replace-window
+
 2005-05-16 [colin]     1.9.9cvs8
 
        * src/gtk/gtkaspell.c

diff --git a/PATCHSETS b/PATCHSETS
index eb39c71d9bc1e438cbc1093d1862e376266f79cd..457b348abec9808b0ce3cc6e00310f0597b063ea 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -483,3 +483,4 @@
 ( cvs diff -u -r 1.9.2.13 -r 1.9.2.14 src/gtk/gtkaspell.c; ) > 1.9.9cvs6.patchset
 ( cvs diff -u -r 1.9.2.14 -r 1.9.2.15 src/gtk/gtkaspell.c; ) > 1.9.9cvs7.patchset
 ( cvs diff -u -r 1.9.2.15 -r 1.9.2.16 src/gtk/gtkaspell.c; ) > 1.9.9cvs8.patchset
+( cvs diff -u -r 1.9.2.16 -r 1.9.2.17 src/gtk/gtkaspell.c; ) > 1.9.9cvs9.patchset

diff --git a/configure.ac b/configure.ac
index fe505d2dd309ba8b47bd98e37f4711e783d0246d..c115b4a30803c148e0334968e58f48e37e159672 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=9
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=8
+EXTRA_VERSION=9
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/gtkaspell.c b/src/gtk/gtkaspell.c
index 2b072d26d2e3b45c253c25ebb7b499d2bd562b64..e060eff7b8e2c2e5719c0bdc5ce2b4352a147fb1 100644 (file)
--- a/src/gtk/gtkaspell.c
+++ b/src/gtk/gtkaspell.c
@@ -1423,6 +1423,21 @@ static void check_with_alternate_cb(GtkWidget *w, gpointer data)
        set_point_continue(gtkaspell);
 }
        
+static gboolean replace_key_pressed(GtkWidget *widget,
+                                  GdkEventKey *event,
+                                  GtkAspell *gtkaspell)
+{
+       if (event && event->keyval == GDK_Escape) {
+               gtk_widget_destroy(widget);
+               return TRUE;
+       } else if (event && event->keyval == GDK_Return) {
+               replace_with_supplied_word_cb(NULL, gtkaspell);
+               gtk_widget_destroy(widget);
+               return TRUE;
+       }
+       return FALSE;
+}
+       
 static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
 {
        GtkWidget *dialog;
@@ -1462,12 +1477,9 @@ static void replace_with_create_dialog_cb(GtkWidget *w, gpointer data)
        gtkaspell->replace_entry = entry;
        gtk_entry_set_text(GTK_ENTRY(entry), gtkaspell->theword);
        gtk_editable_select_region(GTK_EDITABLE(entry), 0, -1);
-       g_signal_connect(G_OBJECT(entry), "activate",
-                        G_CALLBACK(replace_with_supplied_word_cb), 
-                        gtkaspell);
-       g_signal_connect_swapped(G_OBJECT(entry), "activate",
-                                G_CALLBACK(gtk_widget_destroy), 
-                                G_OBJECT(dialog));
+       g_signal_connect(G_OBJECT(dialog),
+                       "key_press_event",
+                       G_CALLBACK(replace_key_pressed), gtkaspell);
        gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
 
        gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, TRUE, 
@@ -1916,6 +1928,9 @@ static GtkMenu *make_sug_menu(GtkAspell *gtkaspell)
                         gtkaspell);
        gtk_widget_add_accelerator(item, "activate", accel, GDK_R, 0,
                                   GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
+       gtk_widget_add_accelerator(item, "activate", accel, GDK_R, 
+                                  GDK_CONTROL_MASK,
+                                  GTK_ACCEL_LOCKED);
 
        if (gtkaspell->use_alternate && gtkaspell->alternate_speller) {
                caption = g_strdup_printf(_("Check with %s"), 
@@ -1929,6 +1944,9 @@ static GtkMenu *make_sug_menu(GtkAspell *gtkaspell)
                                 gtkaspell);
                gtk_widget_add_accelerator(item, "activate", accel, GDK_X, 0,
                                           GTK_ACCEL_LOCKED | GTK_ACCEL_VISIBLE);
+               gtk_widget_add_accelerator(item, "activate", accel, GDK_X, 
+                                          GDK_CONTROL_MASK,
+                                          GTK_ACCEL_LOCKED);
        }
 
        item = gtk_menu_item_new();