X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-import-assistant.c;h=2eb5e89acbcc1f5b708132e787a845d9a9827544;hb=d9d46e3c7ef1a275f57bf9f8ad3e47231d6fb58c;hp=89d1cf8e6decbcb5829e5d75c7df22889db0dc32;hpb=59cfbfe341a4b5b5c3af9071977a389f26502063;p=pspp

diff --git a/src/ui/gui/psppire-import-assistant.c b/src/ui/gui/psppire-import-assistant.c
index 89d1cf8e6d..2eb5e89acb 100644
--- a/src/ui/gui/psppire-import-assistant.c
+++ b/src/ui/gui/psppire-import-assistant.c
@@ -958,7 +958,7 @@ psppire_import_assistant_init (PsppireImportAssistant *ia)
 
   gtk_assistant_set_forward_page_func (GTK_ASSISTANT (ia), next_page_func, NULL, NULL);
 
-  gtk_window_fullscreen (GTK_WINDOW (ia));
+  gtk_window_maximize (GTK_WINDOW (ia));
 }
 
 
@@ -1740,18 +1740,24 @@ make_data_column (PsppireImportAssistant *ia, GtkWidget *tree_view,
 {
   struct variable *var = NULL;
   struct column *column = NULL;
-  size_t char_cnt;
+  size_t char_cnt = 0;
   gint content_width, header_width;
   PsppSheetViewColumn *tree_column;
-  char *name;
+  char *name = NULL;
 
   if (input)
-    column = &ia->columns[dict_idx];
+    {
+      column = &ia->columns[dict_idx];
+      name = escape_underscores (column->name);
+      char_cnt = column->width; 
+    }
   else
-    var = dict_get_var (ia->dict, dict_idx);
+    {
+      var = dict_get_var (ia->dict, dict_idx);
+      name = escape_underscores (var_get_name (var));
+      char_cnt = var_get_print_format (var)->w;
+    }
 
-  name = escape_underscores (input ? column->name : var_get_name (var));
-  char_cnt = input ? column->width : var_get_print_format (var)->w;
   content_width = get_monospace_width (tree_view, ia->fixed_renderer,
                                        char_cnt);
   header_width = get_string_width (tree_view, ia->prop_renderer,