# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1212596687 -10800
# Node ID 93b9364bd7315623633f9635367ece66c77e9975
# Parent  a2cbde1af409d1109fdb1fea1ec122f20230f241# Parent  0a2255b9e80b36db5416bfea3149093b7fd9231f
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r a2cbde1af409 -r 93b9364bd731 acinclude.m4
--- a/acinclude.m4	Wed Jun 04 12:36:25 2008 +0200
+++ b/acinclude.m4	Wed Jun 04 19:24:47 2008 +0300
@@ -82,18 +82,18 @@
 
 dnl ** Check for GNU make
 AC_DEFUN([AUD_CHECK_GNU_MAKE],[
-    AC_CACHE_CHECK([for GNU make],aud_gnu_make_command,[
-    aud_gnu_make_command=""
+    AC_CACHE_CHECK([for GNU make],cv_gnu_make_command,[
+    cv_gnu_make_command=""
     for a in "$MAKE" make gmake gnumake; do
         test "x$a" = "x" && continue
         if ( sh -c "$a --version" 2>/dev/null | grep "GNU Make" >/dev/null ) ; then
-            aud_gnu_make_command="$a"
+            cv_gnu_make_command="$a"
             break
         fi
     done
     ])
-    if test "x$aud_gnu_make_command" != "x" ; then
-        MAKE="$aud_gnu_make_command"
+    if test "x$cv_gnu_make_command" != "x" ; then
+        MAKE="$cv_gnu_make_command"
     else
         AC_MSG_ERROR([** GNU make not found. If it is installed, try setting MAKE environment variable. **])
     fi
diff -r a2cbde1af409 -r 93b9364bd731 src/audtool/audtool_handlers_playlist.c
--- a/src/audtool/audtool_handlers_playlist.c	Wed Jun 04 12:36:25 2008 +0200
+++ b/src/audtool/audtool_handlers_playlist.c	Wed Jun 04 19:24:47 2008 +0300
@@ -381,8 +381,8 @@
 		audtool_whine("invalid parameters for %s.", argv[0]);
 		audtool_whine("syntax: %s <fieldname> <position>", argv[0]);
 		audtool_whine("  - fieldname example choices include but are not limited to:");
-		audtool_whine("      artist, album, title, track_number, year, date,");
-		audtool_whine("      genre, comment, file_name, file_ext, file_path,");
+		audtool_whine("      artist, album, title, track-number, year, date,");
+		audtool_whine("      genre, comment, file-name, file-ext, file-path,");
 		audtool_whine("      length, formatter, custom, mtime");
 		exit(1);
 	}
diff -r a2cbde1af409 -r 93b9364bd731 src/audtool/audtool_handlers_vitals.c
--- a/src/audtool/audtool_handlers_vitals.c	Wed Jun 04 12:36:25 2008 +0200
+++ b/src/audtool/audtool_handlers_vitals.c	Wed Jun 04 19:24:47 2008 +0300
@@ -168,8 +168,8 @@
 		audtool_whine("invalid parameters for %s.", argv[0]);
 		audtool_whine("syntax: %s <fieldname>", argv[0]);
 		audtool_whine("  - fieldname example choices include but are not limited to:");
-		audtool_whine("      artist, album, title, track_number, year, date,");
-		audtool_whine("      genre, comment, file_name, file_ext, file_path,");
+		audtool_whine("      artist, album, title, track-number, year, date,");
+		audtool_whine("      genre, comment, file-name, file-ext, file-path,");
 		audtool_whine("      length, formatter, custom, mtime");
 		exit(1);
 	}
diff -r a2cbde1af409 -r 93b9364bd731 src/libaudclient/audctrl.c
--- a/src/libaudclient/audctrl.c	Wed Jun 04 12:36:25 2008 +0200
+++ b/src/libaudclient/audctrl.c	Wed Jun 04 19:24:47 2008 +0300
@@ -1028,16 +1028,23 @@
     if (G_IS_VALUE(&value) == FALSE)
         return NULL;
 
+    /* I think the original "purpose" of using g_strescape() here
+     * has probably been to escape only \n, \t, \r, etc. but the function
+     * actually escapes all non-ASCII characters. Which is bad, since we
+     * are using UTF-8.  -- ccr
+     */
     if (G_VALUE_HOLDS_STRING(&value))
-        s = g_strescape(g_value_get_string(&value), NULL);
+        //s = g_strescape(g_value_get_string(&value), NULL);
+        s = g_strdup(g_value_get_string(&value));
     else if (g_value_type_transformable(G_VALUE_TYPE(&value), G_TYPE_STRING))
     {
         GValue tmp_value = { 0, };
 
         g_value_init(&tmp_value, G_TYPE_STRING);
         g_value_transform(&value, &tmp_value);
-
-        s = g_strescape(g_value_get_string(&tmp_value), NULL);
+        
+        //s = g_strescape(g_value_get_string(&tmp_value), NULL);
+        s = g_strdup(g_value_get_string(&tmp_value));
 
         g_value_unset(&tmp_value);
     }