X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Faggregate-dialog.c;h=7fce9f55637481e837719c0f4a29a8a8672c76f1;hb=698f289d1ecf1620aa5429599f2e76db23cff452;hp=ced6a32c10f3b152a1f89bd0a328ac6c762017a6;hpb=0c5217288cb57d0994d4c99997f5341e2c3a6871;p=pspp

diff --git a/src/ui/gui/aggregate-dialog.c b/src/ui/gui/aggregate-dialog.c
index ced6a32c10..7fce9f5563 100644
--- a/src/ui/gui/aggregate-dialog.c
+++ b/src/ui/gui/aggregate-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2010  Free Software Foundation
+   Copyright (C) 2010, 2011, 2012  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@
 #include "dict-display.h"
 
 #include "executor.h"
+#include "builder-wrapper.h"
 #include "helper.h"
 
 #include <gtk/gtk.h>
@@ -164,20 +165,19 @@ choose_filename (struct aggregate *fd)
 							   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 							   GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
 							   NULL);
+  g_object_set (dialog, "local-only", FALSE, NULL);
 
   gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
 
 
   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);
 
 
@@ -456,7 +456,7 @@ set_initial_pos (GtkPaned *pane)
 		"max-position", &max_pos,
 		NULL);
 
-  gtk_paned_set_position (pane, max_pos / 2);
+  gtk_paned_set_position (pane, max_pos);
 }
 
 
@@ -533,7 +533,7 @@ aggregate_dialog (PsppireDataWindow *dw)
 
     column = gtk_tree_view_get_column (PSPPIRE_ACR (fd.summary_acr)->tv, 0);
 
-    l = gtk_tree_view_column_get_cell_renderers (column);
+    l = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
 
     cell_renderer = l->data;
 
@@ -590,7 +590,7 @@ aggregate_dialog (PsppireDataWindow *dw)
   switch (response)
     {
     case GTK_RESPONSE_OK:
-      g_free (execute_syntax_string (generate_syntax (&fd)));
+      g_free (execute_syntax_string (dw, generate_syntax (&fd)));
       break;
     case PSPPIRE_RESPONSE_PASTE:
       g_free (paste_syntax_to_window (generate_syntax (&fd)));