[Pspp-cvs] pspp/src/ui/gui ChangeLog data-editor.c

[John Darrington]

CVSROOT:        /sources/pspp
Module name:    pspp
Changes by:     John Darrington <jmd>   08/05/08 00:37:12

Modified files:
        src/ui/gui     : ChangeLog data-editor.c 

Log message:
        Don't use gtk_action_connect_proxy for popup menu items which 
        have labels with mnemonics

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.c?cvsroot=pspp&r1=1.72&r2=1.73

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- ChangeLog   7 May 2008 00:16:51 -0000       1.123
+++ ChangeLog   8 May 2008 00:37:12 -0000       1.124
@@ -1,3 +1,10 @@
+2008-05-08  John Darrington <address@hidden>
+
+       * data-editor.c: In popup menus, connect the Insert Variable and
+       Insert Case callbacks manually, instead of relying on
+       gtk_action_connect_proxy, as the latter connects a label with a
+       mnemonic which is inappropriate.
+
 2008-05-06  Ben Pfaff  <address@hidden>
 
        Bug #23127.  Reviewed by John Darrington.  Tested by Jason Stover,

Index: data-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- data-editor.c       25 Mar 2008 09:35:03 -0000      1.72
+++ data-editor.c       8 May 2008 00:37:12 -0000       1.73
@@ -1506,9 +1506,6 @@
   GtkWidget *clear_variable =
     gtk_menu_item_new_with_label (_("Clear"));
 
-  gtk_action_connect_proxy (de->insert_variable,
-                           insert_variable );
-
 
   gtk_action_connect_proxy (de->delete_variables,
                            clear_variable );
@@ -1539,6 +1536,11 @@
                            G_CALLBACK (psppire_data_editor_sort_descending),
                            de->data_editor);
 
+  g_signal_connect_swapped (G_OBJECT (insert_variable), "activate",
+                           G_CALLBACK (gtk_action_activate),
+                           de->insert_variable);
+
+
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), sort_descending);
 
   gtk_widget_show_all (menu);
@@ -1559,16 +1561,16 @@
     gtk_menu_item_new_with_label (_("Clear"));
 
 
-  gtk_action_connect_proxy (de->insert_case,
-                           insert_case);
-
-
   gtk_action_connect_proxy (de->delete_cases,
                            delete_case);
 
 
   gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_case);
 
+  g_signal_connect_swapped (G_OBJECT (insert_case), "activate",
+                           G_CALLBACK (gtk_action_activate),
+                           de->insert_case);
+
 
   gtk_menu_shell_append (GTK_MENU_SHELL (menu),
                         gtk_separator_menu_item_new ());