librsvg r1180 - trunk

[doml svn gnome org]

Author: doml
Date: Mon Oct 20 14:08:42 2008
New Revision: 1180
URL: http://svn.gnome.org/viewvc/librsvg?rev=1180&view=rev

Log:
2008-10-20  Dominic Lachowicz <domlachowicz gmail com>

        * rsvg-convert.c: command-line tools can't handle UTF-8 encoded
        filenames (#557036, reported by Tim Starling)
        * test-display.c: ditto



Modified:
   trunk/ChangeLog
   trunk/rsvg-convert.c
   trunk/test-display.c

Modified: trunk/rsvg-convert.c
==============================================================================
--- trunk/rsvg-convert.c	(original)
+++ trunk/rsvg-convert.c	Mon Oct 20 14:08:42 2008
@@ -31,6 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <locale.h>
 
 #include "rsvg.h"
 #include "rsvg-cairo.h"
@@ -52,7 +53,7 @@
 display_error (GError * err)
 {
     if (err) {
-        g_print ("%s", err->message);
+        g_print ("%s\n", err->message);
         g_error_free (err);
     }
 }
@@ -166,6 +167,9 @@
         {NULL}
     };
 
+	/* Set the locale so that UTF-8 filenames work */
+	setlocale(LC_ALL, "");
+
 	g_thread_init(NULL);
 
     g_option_context = g_option_context_new (_("- SVG Converter"));

Modified: trunk/test-display.c
==============================================================================
--- trunk/test-display.c	(original)
+++ trunk/test-display.c	Mon Oct 20 14:08:42 2008
@@ -24,6 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <locale.h>
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
@@ -692,6 +693,9 @@
         {NULL}
     };
 
+	/* Set the locale so that UTF-8 filenames work */
+	setlocale(LC_ALL, "");
+
     g_thread_init (NULL);
 
     info.pixbuf = NULL;