Don't ignore all trailing whitespace in input text. Only chop one newline.

2006-08-01  Behdad Esfahbod  <behdad@gnome.org>

        * examples/renderdemo.c (parse_options): Don't ignore all trailing
        whitespace in input text.  Only chop one newline.

        * examples/viewer-main.c (main): setlocale(LC_ALL, "") to get GOption
        work for UTF-8 text on the command line.

3 files changed, 16 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 9fa7abd7..e1c92b15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-01  Behdad Esfahbod  <behdad@gnome.org>
+
+	* examples/renderdemo.c (parse_options): Don't ignore all trailing
+	whitespace in input text.  Only chop one newline.
+
+	* examples/viewer-main.c (main): setlocale(LC_ALL, "") to get GOption
+	work for UTF-8 text on the command line.
+
 2006-07-31  Behdad Esfahbod  <behdad@gnome.org>
 
 	* === Released 1.13.5 ===
diff --git a/examples/renderdemo.c b/examples/renderdemo.c
index 0dda7eb2..5a38ffd2 100644
--- a/examples/renderdemo.c
+++ b/examples/renderdemo.c
@@ -640,19 +640,13 @@ parse_options (int argc, char *argv[])
 	fail ("%s\n", error->message);
     }
 
-  /* Strip trailing whitespace
+  /* Strip one trailing newline
    */
-  p = text + len;
-  while (p > text)
-    {
-      gunichar ch;
-      p = g_utf8_prev_char (p);
-      ch = g_utf8_get_char (p);
-      if (!g_unichar_isspace (ch))
-	break;
-      else
-	*p = '\0';
-    }
+  if (len > 0 && text[len - 1] == '\n')
+    len--;
+  if (len > 0 && text[len - 1] == '\r')
+    len--;
+  text[len] = '\0';
 
   /* Make sure we have valid markup
    */
diff --git a/examples/viewer-main.c b/examples/viewer-main.c
index cba50564..9dc7cc88 100644
--- a/examples/viewer-main.c
+++ b/examples/viewer-main.c
@@ -24,6 +24,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <locale.h>
 
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -47,6 +48,7 @@ main (int    argc,
   gpointer surface;
   
   g_type_init();
+  setlocale (LC_ALL, "");
   parse_options (argc, argv);
   
   view = opt_viewer;