[gnumeric] quieten some warings for the stf dialog

[Andreas J. Guelzow <guelzow src gnome org>]

commit 07e80088290a94c09086632f2a31d89e7ada978f
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Tue Sep 13 15:03:51 2011 -0600

    quieten some warings for the stf dialog
    
    2011-09-13  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/dialogs/dialog-stf-csv-page.c: change widget name
    	* src/dialogs/dialog-stf.ui: add missing combobox

 src/dialogs/ChangeLog             |    5 +++++
 src/dialogs/dialog-stf-csv-page.c |    3 ++-
 src/dialogs/dialog-stf.ui         |   29 ++++++++++++++++++++++++-----
 3 files changed, 31 insertions(+), 6 deletions(-)
---
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index ef2283e..5e481f7 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,5 +1,10 @@
 2011-09-13  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* src/dialogs/dialog-stf-csv-page.c: change widget name
+	* src/dialogs/dialog-stf.ui: add missing combobox
+
+2011-09-13  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* dialog-stf-main-page.c (stf_dialog_main_page_init): adjust call to
 	go_guess_encoding
 
diff --git a/src/dialogs/dialog-stf-csv-page.c b/src/dialogs/dialog-stf-csv-page.c
index 96dcd38..d8d6620 100644
--- a/src/dialogs/dialog-stf-csv-page.c
+++ b/src/dialogs/dialog-stf-csv-page.c
@@ -236,7 +236,8 @@ stf_dialog_csv_page_init (GtkBuilder *gui, StfDialogData *pagedata)
 	pagedata->csv.csv_custom          = GTK_CHECK_BUTTON (go_gtk_builder_get_widget (gui, "csv_custom"));
 	pagedata->csv.csv_customseparator = GTK_ENTRY        (go_gtk_builder_get_widget (gui, "csv_customseparator"));
 	pagedata->csv.csv_2x_indicator    = GTK_CHECK_BUTTON (go_gtk_builder_get_widget (gui, "csv_2x_indicator"));
-	pagedata->csv.csv_textindicator   = go_gtk_builder_get_widget (gui, "csv_textindicator");
+
+	pagedata->csv.csv_textindicator   = go_gtk_builder_get_widget (gui, "csv-textindicator");
 	pagedata->csv.csv_textfield       = GTK_ENTRY    (gtk_bin_get_child (GTK_BIN (pagedata->csv.csv_textindicator)));
 
 	pagedata->csv.csv_duplicates      = GTK_CHECK_BUTTON (go_gtk_builder_get_widget (gui, "csv_duplicates"));
diff --git a/src/dialogs/dialog-stf.ui b/src/dialogs/dialog-stf.ui
index 335f461..b3fac75 100644
--- a/src/dialogs/dialog-stf.ui
+++ b/src/dialogs/dialog-stf.ui
@@ -198,8 +198,8 @@
             <child>
               <object class="GtkBox" id="vbox13">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" id="frame11">
                     <property name="visible">True</property>
@@ -570,8 +570,8 @@
             <child>
               <object class="GtkBox" id="vbox14">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox" id="hbox3">
                     <property name="visible">True</property>
@@ -796,9 +796,9 @@
                         <child>
                           <object class="GtkBox" id="vbox6">
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
                             <property name="can_focus">False</property>
                             <property name="border_width">4</property>
+                            <property name="orientation">vertical</property>
                             <property name="spacing">4</property>
                             <child>
                               <object class="GtkBox" id="hbox20">
@@ -819,6 +819,25 @@
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkComboBox" id="csv-textindicator">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="model">csv-textindicator-list</property>
+                                    <property name="has_entry">True</property>
+                                    <property name="entry_text_column">0</property>
+                                    <child internal-child="entry">
+                                      <object class="GtkEntry" id="combobox-entry">
+                                        <property name="can_focus">False</property>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -914,8 +933,8 @@
             <child>
               <object class="GtkBox" id="vbox15">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkFrame" id="frame9">
                     <property name="visible">True</property>
@@ -1037,8 +1056,8 @@
             <child>
               <object class="GtkBox" id="vbox16">
                 <property name="visible">True</property>
-                <property name="orientation">vertical</property>
                 <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox" id="hbox16">
                     <property name="visible">True</property>