X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ftext-data-import-dialog.c;h=34127492fa9393ec03a7a157342cd07d71360fd1;hb=03a7b96a587a58bda342b4eb5ce5f935880ba2b7;hp=d1252592e8e9056dadf0867596c6abe61370e0ca;hpb=681924fb9b8db641a6dc81abfac0a985799446da;p=pspp

diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c
index d1252592e8..34127492fa 100644
--- a/src/ui/gui/text-data-import-dialog.c
+++ b/src/ui/gui/text-data-import-dialog.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013  Free Software Foundation
+   Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014  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
@@ -122,7 +122,7 @@ text_data_import_assistant (PsppireDataWindow *dw)
     case GTK_RESPONSE_APPLY:
       {
 	gchar *fn = g_path_get_basename (ia->file.file_name);
-	open_data_window (PSPPIRE_WINDOW (dw), fn, generate_syntax (ia));
+	open_data_window (PSPPIRE_WINDOW (dw), fn, NULL, generate_syntax (ia));
 	g_free (fn);
       }
       break;
@@ -138,10 +138,6 @@ text_data_import_assistant (PsppireDataWindow *dw)
       destroy_formats_page (ia);
       destroy_separators_page (ia);
     }
-
-  destroy_assistant (ia);
-  destroy_file (ia);
-  free (ia);
 }
 
 /* Emits PSPP syntax to S that applies the dictionary attributes
@@ -575,8 +571,8 @@ get_string_width (PsppSheetView *treeview, GtkCellRenderer *renderer,
 {
   gint width;
   g_object_set (G_OBJECT (renderer), "text", string, (void *) NULL);
-  gtk_cell_renderer_get_size (renderer, GTK_WIDGET (treeview),
-                              NULL, NULL, NULL, &width, NULL);
+  gtk_cell_renderer_get_preferred_width (renderer, GTK_WIDGET (treeview),
+			      NULL, &width);
   return width;
 }
 
@@ -658,8 +654,8 @@ push_watch_cursor (struct import_assistant *ia)
       GtkWidget *widget = GTK_WIDGET (ia->asst.assistant);
       GdkDisplay *display = gtk_widget_get_display (widget);
       GdkCursor *cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
-      gdk_window_set_cursor (widget->window, cursor);
-      gdk_cursor_unref (cursor);
+      gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
+      g_object_unref (cursor);
       gdk_display_flush (display);
     }
 }
@@ -672,6 +668,6 @@ pop_watch_cursor (struct import_assistant *ia)
   if (--ia->asst.watch_cursor == 0)
     {
       GtkWidget *widget = GTK_WIDGET (ia->asst.assistant);
-      gdk_window_set_cursor (widget->window, NULL);
+      gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
     }
 }