[goffice] embedder: output simpler strings.



commit c3f0fbfb7b784249f5497ec108a0733355011559
Author: Morten Welinder <terra gnome org>
Date:   Sun Mar 25 17:11:00 2012 -0400

    embedder: output simpler strings.
    
    We unintentionally started some lines with three quotes and intltool 0.50
    got upset.

 ChangeLog      |    6 ++++++
 NEWS           |    1 +
 tools/embedder |    1 +
 3 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 4105319..deab84c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-03-25  Morten Welinder  <terra gnome org>
+
+	* tools/embedder (embed_data): When we go to a new line, clear the
+	nohex flag.  This avoids lines starting with three quotes which
+	confuse the heck out of intltool 0.50
+
 2012-03-21  Morten Welinder  <terra gnome org>
 
 	* goffice/utils/go-format.c (go_format_output_to_odf): Undo last
diff --git a/NEWS b/NEWS
index f7508bb..792c15f 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ Morten:
 	* Fix minor multihead issue with help buttons in dialogs.
 	* Eliminate GoComboText -- use GtkComboBoxText instead.
 	* Avoid critical in GOPixbuf code.
+	* Work around intltool bug.  [#672771]
 
 --------------------------------------------------------------------------
 goffice 0.9.2:
diff --git a/tools/embedder b/tools/embedder
index 3102ed5..8764eff 100755
--- a/tools/embedder
+++ b/tools/embedder
@@ -134,6 +134,7 @@ sub embed_data {
 	if ($linelen == 0) {
 	    print "    \"";
 	    $linelen += 5;
+	    $nohex = 0;
 	} 
 
 	my $thisnohex = $nohex;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]