# HG changeset patch # User Matti Hamalainen # Date 1212616417 -10800 # Node ID 30782d57c7e608e2711870f39b76ca5b7f0704d7 # Parent 23a9ded30c701e4f94232e44f266e16dcfdc2bd7 We already require Glib >= 2.14, so these #if's for checking >= 2.12 are now obsolete and thus got removed. diff -r 23a9ded30c70 -r 30782d57c7e6 src/audtool/audtool_handlers_playlist.c --- a/src/audtool/audtool_handlers_playlist.c Wed Jun 04 23:30:29 2008 +0300 +++ b/src/audtool/audtool_handlers_playlist.c Thu Jun 05 00:53:37 2008 +0300 @@ -252,9 +252,7 @@ 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) ) || g_unichar_iswide_cjk(g_utf8_get_char(p)) -#endif ){ column += (stride - 2); } diff -r 23a9ded30c70 -r 30782d57c7e6 src/audtool/audtool_handlers_playqueue.c --- a/src/audtool/audtool_handlers_playqueue.c Wed Jun 04 23:30:29 2008 +0300 +++ b/src/audtool/audtool_handlers_playqueue.c Thu Jun 05 00:53:37 2008 +0300 @@ -192,9 +192,7 @@ 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) ) || g_unichar_iswide_cjk(g_utf8_get_char(p)) -#endif ){ column += (stride - 2); }