Filter file choosers by mimetype instead of file name

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

diff --git a/src/ui/gui/psppire-window.c b/src/ui/gui/psppire-window.c
index edaa372670755020b0cfc9594e8cb0c6d5fde3db..f6cdb7b24368f5686832569799a3beb522ec05a7 100644 (file)
--- a/src/ui/gui/psppire-window.c
+++ b/src/ui/gui/psppire-window.c
@@ -38,7 +38,6 @@
 #include "psppire-window-register.h"
 #include "psppire.h"
 
-static void psppire_window_base_finalize (PsppireWindowClass *, gpointer);
 static void psppire_window_base_init     (PsppireWindowClass *class);
 static void psppire_window_class_init    (PsppireWindowClass *class);
 static void psppire_window_init          (PsppireWindow      *window);
@@ -57,7 +56,7 @@ psppire_window_get_type (void)
       {
        sizeof (PsppireWindowClass),
        (GBaseInitFunc) psppire_window_base_init,
-        (GBaseFinalizeFunc) psppire_window_base_finalize,
+        (GBaseFinalizeFunc) NULL,
        (GClassInitFunc) psppire_window_class_init,
        (GClassFinalizeFunc) NULL,
        NULL,
@@ -85,12 +84,6 @@ enum
 };
 
 
-gchar *
-uniquify (const gchar *str, int *x)
-{
-  return g_strdup_printf ("%s%d", str, (*x)++);
-}
-
 static void
 psppire_window_set_title (PsppireWindow *window)
 {
@@ -328,12 +321,6 @@ psppire_window_base_init (PsppireWindowClass *class)
 
 
 
-static void
-psppire_window_base_finalize (PsppireWindowClass *class,
-                               gpointer class_data)
-{
-}
-
 static void
 menu_toggled (GtkCheckMenuItem *mi, gpointer data)
 {
@@ -501,7 +488,7 @@ psppire_window_init (PsppireWindow *window)
 
   g_signal_connect_swapped (window, "delete-event", G_CALLBACK (on_delete), window);
 
-  g_object_set (window, "icon-name", "psppicon", NULL);
+  g_object_set (window, "icon-name", "pspp", NULL);
 
   g_signal_connect (window, "realize",
                    G_CALLBACK (on_realize), window);
@@ -539,7 +526,7 @@ psppire_window_query_save (PsppireWindow *se)
                            description);
   g_free (description);
 
-  g_object_set (dialog, "icon-name", "psppicon", NULL);
+  g_object_set (dialog, "icon-name", "pspp", NULL);
 
   gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                            _("If you don't save, changes from the last %ld seconds will be permanently lost."),
@@ -722,6 +709,7 @@ psppire_window_load (PsppireWindow *w, const gchar *file)
 GtkWidget *
 psppire_window_file_chooser_dialog (PsppireWindow *toplevel)
 {
+  GtkFileFilter *filter = gtk_file_filter_new ();
   GtkWidget *dialog =
     gtk_file_chooser_dialog_new (_("Open"),
                                 GTK_WINDOW (toplevel),
@@ -730,28 +718,23 @@ psppire_window_file_chooser_dialog (PsppireWindow *toplevel)
                                 GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                                 NULL);
 
-  GtkFileFilter *filter;
+  g_object_set (dialog, "local-only", FALSE, NULL);
 
-  filter = gtk_file_filter_new ();
   gtk_file_filter_set_name (filter, _("Data and Syntax Files"));
-  gtk_file_filter_add_pattern (filter, "*.sav");
-  gtk_file_filter_add_pattern (filter, "*.SAV");
-  gtk_file_filter_add_pattern (filter, "*.por");
-  gtk_file_filter_add_pattern (filter, "*.POR");
+  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, "*.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_add_pattern (filter, "*.sav");
-  gtk_file_filter_add_pattern (filter, "*.SAV");
+  gtk_file_filter_add_mime_type (filter, "application/x-spss-sav");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
   filter = gtk_file_filter_new ();
   gtk_file_filter_set_name (filter, _("Portable Files (*.por) "));
-  gtk_file_filter_add_pattern (filter, "*.por");
-  gtk_file_filter_add_pattern (filter, "*.POR");
+  gtk_file_filter_add_mime_type (filter, "application/x-spss-por");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
   filter = gtk_file_filter_new ();