X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpage-separators.c;h=e153a231f53a296698ccbddd08e2a1f2198abecf;hb=52e841a9c7ddef8b46bd66833f8a0709f6d1db0d;hp=d16f0fe3d21c20992e481f7220b2dca889abed36;hpb=fea69317c31a60056bf6a2c1260b1113aafb7e5a;p=pspp

diff --git a/src/ui/gui/page-separators.c b/src/ui/gui/page-separators.c
index d16f0fe3d2..e153a231f5 100644
--- a/src/ui/gui/page-separators.c
+++ b/src/ui/gui/page-separators.c
@@ -58,7 +58,24 @@
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-
+/* Page where the user chooses field separators. */
+struct separators_page
+  {
+    /* How to break lines into columns. */
+    struct string separators;   /* Field separators. */
+    struct string quotes;       /* Quote characters. */
+    bool escape;                /* Doubled quotes yield a quote mark? */
+
+    GtkWidget *page;
+    GtkWidget *custom_cb;
+    GtkWidget *custom_entry;
+    GtkWidget *quote_cb;
+    GtkWidget *quote_combo;
+    GtkEntry *quote_entry;
+    GtkWidget *escape_cb;
+    GtkTreeView *fields_tree_view;
+  };
+
 /* The "separators" page of the assistant. */
 
 static void revise_fields_preview (struct import_assistant *ia);
@@ -130,17 +147,20 @@ set_quote_list (GtkComboBoxEntry *cb)
 }
 
 /* Initializes IA's separators substructure. */
-void
-init_separators_page (struct import_assistant *ia)
+
+struct separators_page *
+separators_page_create (struct import_assistant *ia)
 {
   GtkBuilder *builder = ia->asst.builder;
-  struct separators_page *p = ia->separators;
+
   size_t i;
 
-  choose_likely_separators (ia);
+  struct separators_page *p = xzalloc (sizeof *p);
 
+#if 0
   p->page = add_page_to_assistant (ia, get_widget_assert (builder, "Separators"),
                                    GTK_ASSISTANT_PAGE_CONTENT);
+#endif
   p->custom_cb = get_widget_assert (builder, "custom-cb");
   p->custom_entry = get_widget_assert (builder, "custom-entry");
   p->quote_combo = get_widget_assert (builder, "quote-combo");
@@ -148,7 +168,6 @@ init_separators_page (struct import_assistant *ia)
   p->quote_cb = get_widget_assert (builder, "quote-cb");
   p->escape_cb = get_widget_assert (builder, "escape");
 
-  set_separators (ia);
   set_quote_list (GTK_COMBO_BOX_ENTRY (p->quote_combo));
   p->fields_tree_view = GTK_TREE_VIEW (get_widget_assert (builder, "fields"));
   g_signal_connect (p->quote_combo, "changed",
@@ -164,6 +183,8 @@ init_separators_page (struct import_assistant *ia)
                       "toggled", G_CALLBACK (on_separator_toggle), ia);
   g_signal_connect (p->escape_cb, "toggled",
                     G_CALLBACK (on_separator_toggle), ia);
+
+  return p;
 }
 
 /* Frees IA's separators substructure. */
@@ -328,15 +349,13 @@ split_fields (struct import_assistant *ia)
 static void
 choose_column_names (struct import_assistant *ia)
 {
-  const struct first_line_page *f = ia->first_line;
-  struct separators_page *s = ia->separators;
   struct dictionary *dict;
   unsigned long int generated_name_count = 0;
   struct column *col;
   size_t name_row;
 
   dict = dict_create (get_default_encoding ());
-  name_row = f->variable_names && f->skip_lines ? f->skip_lines : 0;
+  name_row = ia->variable_names && ia->skip_lines ? ia->skip_lines : 0;
   for (col = ia->columns; col < &ia->columns[ia->column_cnt]; col++)
     {
       char *hint, *name;