gthumb r2355 - in trunk: . src

[mjc svn gnome org]

Author: mjc
Date: Mon Jul 21 17:38:50 2008
New Revision: 2355
URL: http://svn.gnome.org/viewvc/gthumb?rev=2355&view=rev

Log:
2008-07-21  Michael J. Chudobiak  <mjc svn gnome org>

        * NEWS:
        * src/catalog-web-exporter.c: (_write_line), (_write_locale_line),
        (write_line), (write_markup_escape_line),
        (write_markup_escape_locale_line):
        Fixed bug #543993: web export of camera data prints warnings
        about _g_escape_text_for_html. Patch by Patch by Christophe BisiÃre.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/catalog-web-exporter.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Mon Jul 21 17:38:50 2008
@@ -46,6 +46,8 @@
 	  acceleration. Bug #472491.
 	* Fixed bug #327245: Full screen mode crippled if Xinerama is used
 	* Added support for importing ASF files (bug #471496)
+	* Fixed bug #543993: web export of camera data prints warnings 
+	  about _g_escape_text_for_html
 
 	Other features:
 	* Added basic XMP metadata support (read only)

Modified: trunk/src/catalog-web-exporter.c
==============================================================================
--- trunk/src/catalog-web-exporter.c	(original)
+++ trunk/src/catalog-web-exporter.c	Mon Jul 21 17:38:50 2008
@@ -1006,12 +1006,30 @@
 
 
 static void
+_write_line (const char *line, FILE *fout)
+{
+	fwrite (line, sizeof (char), strlen (line), fout);
+}
+
+
+static void
+_write_locale_line (const char *line, FILE *fout)
+{
+	char *utf8_line;
+
+	utf8_line = g_locale_to_utf8 (line, -1, 0, 0, 0);
+	_write_line (utf8_line, fout);
+	g_free (utf8_line);
+}
+
+
+static void
 write_line (const char *line, FILE *fout)
 {
 	if (line_is_void (line))
 		return;
 
-	fwrite (line, sizeof (char), strlen (line), fout);
+	_write_line (line, fout);
 }
 
 
@@ -1020,35 +1038,27 @@
 {
 	char *e_line;
 
+	if (line_is_void (line))
+		return;
+	
 	e_line = _g_escape_text_for_html (line, -1);
-	write_line (e_line, fout);
+	_write_line (e_line, fout);
 	g_free (e_line);
 }
 
 
 static void
-write_locale_line (const char *line, FILE *fout)
+write_markup_escape_locale_line (const char *line, FILE *fout)
 {
-	char *utf8_line;
+	char *e_line;
 
 	if (line == NULL)
 		return;
 	if (*line == 0)
 		return;
-
-	utf8_line = g_locale_to_utf8 (line, -1, 0, 0, 0);
-	write_line (utf8_line, fout);
-	g_free (utf8_line);
-}
-
-
-static void
-write_markup_escape_locale_line (const char *line, FILE *fout)
-{
-	char *e_line;
-
+	
 	e_line = _g_escape_text_for_html (line, -1);
-	write_locale_line (e_line, fout);
+	_write_locale_line (e_line, fout);
 	g_free (e_line);
 }