TextImportDialog: GtkVPaned --> GtkPaned

[pspp] / src / ui / gui / text-data-import-dialog.c

diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c
index cfdbd628117933d91a52cb64a5d23052a2f991d9..1527028c28ec06934244c0ecc065401e6f1b88ea 100644 (file)
--- a/src/ui/gui/text-data-import-dialog.c
+++ b/src/ui/gui/text-data-import-dialog.c
@@ -575,8 +575,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;
 }
 
@@ -659,7 +659,7 @@ push_watch_cursor (struct import_assistant *ia)
       GdkDisplay *display = gtk_widget_get_display (widget);
       GdkCursor *cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
       gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
-      gdk_cursor_unref (cursor);
+      g_object_unref (cursor);
       gdk_display_flush (display);
     }
 }