X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.c;h=f7df21c752e746bec52f647f672db0082e387fba;hb=9a04fda196e392d456f034e1fc2ad744a20d22b4;hp=b4da5b9f49bc2a8e94ad14bb702baaecac2fdc09;hpb=f3836c463d118e17f5049236ba016ca87d8d3eee;p=pspp-builds.git

diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c
index b4da5b9f..f7df21c7 100644
--- a/src/ui/gui/data-editor.c
+++ b/src/ui/gui/data-editor.c
@@ -1375,6 +1375,11 @@ data_save_as_dialog (GtkAction *action, struct data_editor *de)
 	de->save_as_portable =
 	  ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button_sys));
 
+	if ( de->save_as_portable)
+	  append_filename_suffix (de, ".por");
+	else
+	  append_filename_suffix (de, ".sav");
+
 	save_file (de);
 
 	window_set_name_from_filename (e, de->file_name);
@@ -1506,9 +1511,6 @@ create_data_sheet_variable_popup_menu (struct data_editor *de)
   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 +1541,11 @@ create_data_sheet_variable_popup_menu (struct data_editor *de)
 			    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 +1566,16 @@ create_data_sheet_cases_popup_menu (struct data_editor *de)
     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 ());