[gnumeric] Add back the text indicator combo box. [#633241]

[Jean Bréfort <jbrefort src gnome org>]

commit 0ca9216c663e5dbf0f74964f2f47ddf365b4063f
Author: Jean Brefort <jean brefort normalesup org>
Date:   Wed Oct 27 10:48:16 2010 +0200

    Add back the text indicator combo box. [#633241]

 src/dialogs/ChangeLog             |    6 ++++++
 src/dialogs/dialog-stf-csv-page.c |    4 ++--
 src/dialogs/dialog-stf.ui         |   29 +++++++++++++++++++++++++++--
 3 files changed, 35 insertions(+), 4 deletions(-)
---
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 024bfd5..2f64e90 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-27  Jean Brefort  <jean brefort normalesup org>
+
+	* dialog-stf-csv-page.c (stf_dialog_csv_page_init): add back the text
+	indicator combo box. [#633241]
+	* dialog-stf.ui: ditto.
+
 2010-10-24  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* dialog-cell-sort.c (dialog_cell_sort_load_sort_setup): set button
diff --git a/src/dialogs/dialog-stf-csv-page.c b/src/dialogs/dialog-stf-csv-page.c
index 060141a..13c1904 100644
--- a/src/dialogs/dialog-stf-csv-page.c
+++ b/src/dialogs/dialog-stf-csv-page.c
@@ -237,8 +237,8 @@ stf_dialog_csv_page_init (GtkBuilder *gui, StfDialogData *pagedata)
 	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_textfield       = GTK_ENTRY    (go_gtk_builder_get_widget (gui, "csv_textfield"));
-
+	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"));
 	pagedata->csv.csv_trim_seps       = GTK_CHECK_BUTTON (go_gtk_builder_get_widget (gui, "csv_trim_seps"));
 	pagedata->csv.csv_data_container  =                   go_gtk_builder_get_widget (gui, "csv_data_container");
diff --git a/src/dialogs/dialog-stf.ui b/src/dialogs/dialog-stf.ui
index 1652cab..74b2fc0 100644
--- a/src/dialogs/dialog-stf.ui
+++ b/src/dialogs/dialog-stf.ui
@@ -604,7 +604,7 @@
                                     <property name="label" translatable="yes">Te_xt indicator: </property>
                                     <property name="use_underline">True</property>
                                     <property name="justify">center</property>
-                                    <property name="mnemonic_widget">csv_textfield</property>
+                                    <property name="mnemonic_widget">csv_textindicator</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
@@ -613,7 +613,15 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <placeholder/>
+                                  <object class="GtkComboBoxEntry" id="csv_textindicator">
+                                    <property name="visible">True</property>
+                                    <property name="model">csv-textindicator-list</property>
+                                    <property name="active">0</property>
+                                    <property name="text_column">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
                               </object>
                               <packing>
@@ -1070,4 +1078,21 @@
       <action-widget response="-5">finish_button</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkListStore" id="csv-textindicator-list">
+    <columns>
+      <!-- column-name text -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">"</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">'</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">`</col>
+      </row>
+    </data>
+  </object>
 </interface>