Mercurial > audlegacy

changeset 1953:e00f2d82233b trunk

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[svn] - build fix
author yaz
date Sun, 05 Nov 2006 22:26:49 -0800
parents 52dda29aa5e0
children 8fae32163730
files ChangeLog audtool/audtool.c libaudacious/Makefile
diffstat 3 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sun Nov 05 18:38:44 2006 -0800
+++ b/ChangeLog	Sun Nov 05 22:26:49 2006 -0800
@@ -1,3 +1,11 @@
+2006-11-06 02:38:44 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2863]
+  - bump to 1.3.0
+  
+  trunk/configure.ac |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2006-11-06 02:36:26 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2861]
   - NewVFS input probing layer. VFS-Aware plugins can automatically take 
--- a/audtool/audtool.c	Sun Nov 05 18:38:44 2006 -0800
+++ b/audtool/audtool.c	Sun Nov 05 22:26:49 2006 -0800
@@ -522,8 +522,8 @@
 			while(*p){
 				gint stride;
 				stride = g_utf8_next_char(p) - p;
-				if(g_unichar_iswide(g_utf8_get_char(p)) ||
-#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 12)
+				if(g_unichar_iswide(g_utf8_get_char(p))
+#if ( (GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION >= 12) )
 				   || g_unichar_iswide_cjk(g_utf8_get_char(p))
 #endif
                                 ){
@@ -791,8 +791,11 @@
 			while(*p){
 				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(g_unichar_iswide(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 {
--- a/libaudacious/Makefile	Sun Nov 05 18:38:44 2006 -0800
+++ b/libaudacious/Makefile	Sun Nov 05 22:26:49 2006 -0800
@@ -15,6 +15,7 @@
 CFLAGS += $(PICFLAGS) \
 	$(GTK_CFLAGS)        \
 	$(GCONF_CFLAGS)      \
+	-D_AUDACIOUS_CORE    \
 	-I..		      \
 	-I../intl