Merge 'master' into 'gtk3'.

[pspp] / src / ui / gui / psppire-window.c

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index 0a4021f71841585bd02544a07d5103ad32c0a9ee..609b88120d2219116ec2ff1aa5329fd23d81090b 100644 (file)
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -310,8 +310,10 @@ psppire_window_base_init (PsppireWindowClass *class)
 static void
 menu_toggled (GtkCheckMenuItem *mi, gpointer data)
 {
+#if GTK3_TRANSITION
   /* Prohibit changes to the state */
   mi->active = !mi->active;
+#endif
 }
 
 
@@ -355,9 +357,11 @@ insert_menuitem_into_menu (PsppireWindow *window, gpointer key)
 
   gtk_menu_shell_append (window->menu, item);
 
+#if GTK3_TRANSITION
   /* Set the state without emitting a signal */
   GTK_CHECK_MENU_ITEM (item)->active =
    (psppire_window_register_lookup (psppire_window_register_new (), key) == window);
+#endif
 
   g_hash_table_insert (window->menuitem_table, key, item);
 }
@@ -723,13 +727,15 @@ psppire_window_file_chooser_dialog (PsppireWindow *toplevel)
   gtk_file_filter_set_name (filter, _("Data and Syntax Files"));
   gtk_file_filter_add_mime_type (filter, "application/x-spss-sav");
   gtk_file_filter_add_mime_type (filter, "application/x-spss-por");
+  gtk_file_filter_add_pattern (filter, "*.zsav");
   gtk_file_filter_add_pattern (filter, "*.sps");
   gtk_file_filter_add_pattern (filter, "*.SPS");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
   filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
+  gtk_file_filter_set_name (filter, _("System Files (*.sav, *.zsav)"));
   gtk_file_filter_add_mime_type (filter, "application/x-spss-sav");
+  gtk_file_filter_add_pattern (filter, "*.zsav");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
   filter = gtk_file_filter_new ();