[gnumeric] conf: fix terminator to be newline, not backslash-n

[Morten Welinder <mortenw src gnome org>]

commit 16156a2db61828595629af1f8b4b04cac060e5c3
Author: Morten Welinder <terra gnome org>
Date:   Mon Jan 11 09:25:07 2010 -0500

    conf: fix terminator to be newline, not backslash-n

 ChangeLog                           |    4 ++++
 schemas/gnumeric-dialogs.schemas.in |    3 ++-
 tools/ChangeLog                     |    4 ++++
 tools/handle-conf-options           |   13 ++++++++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 50e1124..c625f4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-11  Morten Welinder  <terra gnome org>
+
+	* schemas/gnumeric-dialogs.schemas.in: Fix default for terminator.
+
 2010-01-10 Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* schemas/gnumeric-dialogs.schemas.in: add items
diff --git a/schemas/gnumeric-dialogs.schemas.in b/schemas/gnumeric-dialogs.schemas.in
index 5471faf..1db3055 100644
--- a/schemas/gnumeric-dialogs.schemas.in
+++ b/schemas/gnumeric-dialogs.schemas.in
@@ -581,7 +581,8 @@
         <applyto>/apps/gnumeric/stf/export/terminator</applyto>
         <owner>Gnumeric</owner>
         <type>string</type>
-	<default>\n</default>
+	<default>
+</default>
         <locale name="C">
         <short>Text Export Record Terminator</short>
         <long>Please use the Text Export dialog to edit this value.</long>
diff --git a/tools/ChangeLog b/tools/ChangeLog
index f5b739f..219c876 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-11  Morten Welinder  <terra gnome org>
+
+	* handle-conf-options (quote_c_string): New function.
+
 2009-12-15  Morten Welinder <terra gnome org>
 
 	* Release 1.9.17
diff --git a/tools/handle-conf-options b/tools/handle-conf-options
index a7d929a..3466782 100644
--- a/tools/handle-conf-options
+++ b/tools/handle-conf-options
@@ -283,6 +283,17 @@ sub make_get_conf_node {
     ${$pcfile} .= "}\n\n";
 }
 
+sub quote_c_string {
+    my ($s) = @_;
+
+    return '"' . join ('',
+		       map {
+			   s/([\\""])/\\$1/;
+			   s/\n/\\n/;
+			   $_;
+		       } (split (//, $s))) . '"';
+}
+
 sub create_hcfile {
     @schemas = sort { $a->{'applyto'} cmp $b->{'applyto'} } @schemas;
     &number_schemas ();
@@ -383,7 +394,7 @@ sub create_hcfile {
 	    $cfile .= "}\n\n";
 	} elsif ($type eq 'string' && $gtype eq '0') {
 	    $cfile .= "static struct cb_watch_string $watch_name = {\n";
-	    $cfile .= "\t0, \"$key\", \"$default\",\n";
+	    $cfile .= "\t0, \"$key\", " . &quote_c_string ($default) . ",\n";
 	    $cfile .= "};\n\n";
 
 	    $cfile .= "$get_head\n";