# HG changeset patch
# User nenolod
# Date 1162768165 28800
# Node ID 78e8d9dd5036b79e3912bb0fb9fe219bc251eb05
# Parent  eec23019ef57101af2dd80033d95f7939810950b
[svn] - only use g_unichar_iswide_cjk if GLib 2.12 is available.

diff -r eec23019ef57 -r 78e8d9dd5036 ChangeLog
--- a/ChangeLog	Sun Nov 05 14:27:21 2006 -0800
+++ b/ChangeLog	Sun Nov 05 15:09:25 2006 -0800
@@ -1,3 +1,11 @@
+2006-11-05 22:27:21 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2851]
+  - remove symbols relating to GNOME_VFS
+  
+  trunk/mk/rules.mk.in |    2 --
+  1 file changed, 2 deletions(-)
+
+
 2006-11-05 21:59:09 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2849]
   - require at least 3 bytes of data to search
diff -r eec23019ef57 -r 78e8d9dd5036 audtool/audtool.c
--- a/audtool/audtool.c	Sun Nov 05 14:27:21 2006 -0800
+++ b/audtool/audtool.c	Sun Nov 05 15:09:25 2006 -0800
@@ -523,7 +523,10 @@
 				gint stride;
 				stride = g_utf8_next_char(p) - p;
 				if(g_unichar_iswide(g_utf8_get_char(p)) ||
-				   g_unichar_iswide_cjk(g_utf8_get_char(p))){
+#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 12)
+				   || g_unichar_iswide_cjk(g_utf8_get_char(p))
+#endif
+                                ){
 					column += (stride - 2);
 				}
 				else {