# HG changeset patch # User giacomo # Date 1174511646 25200 # Node ID 6050c7583b06605b73f1dec2f1201914e12b12be # Parent 13cdd6999598f298d26e62eff2078a7a5ba1aba8 [svn] - aosd: use str_to_utf8 (I'll probably add an option to disable the utf8 conversion attempt as well) diff -r 13cdd6999598 -r 6050c7583b06 ChangeLog --- a/ChangeLog Wed Mar 21 11:19:49 2007 -0700 +++ b/ChangeLog Wed Mar 21 14:14:06 2007 -0700 @@ -1,3 +1,11 @@ +2007-03-21 18:19:49 +0000 Giacomo Lozito + revision [1878] + - aosd: fixed ugly memleak in ghosd sources + trunk/src/aosd/ghosd-internal.h | 9 +++++++-- + trunk/src/aosd/ghosd.c | 21 +++++++++++++++------ + 2 files changed, 22 insertions(+), 8 deletions(-) + + 2007-03-21 14:36:32 +0000 Giacomo Lozito revision [1876] alsa: small changes diff -r 13cdd6999598 -r 6050c7583b06 src/aosd/aosd_trigger.c --- a/src/aosd/aosd_trigger.c Wed Mar 21 11:19:49 2007 -0700 +++ b/src/aosd/aosd_trigger.c Wed Mar 21 14:14:06 2007 -0700 @@ -163,7 +163,7 @@ gint pos = playlist_get_position(active); title = playlist_get_songtitle(active, pos); } - gchar *utf8_title = g_locale_to_utf8( title , -1 , NULL , NULL , NULL ); + gchar *utf8_title = str_to_utf8( title ); if ( g_utf8_validate( utf8_title , -1 , NULL ) == TRUE ) { gchar *utf8_title_markup = g_markup_printf_escaped( @@ -230,7 +230,7 @@ if ( ( pl_entry->title != NULL ) && ( strcmp(pl_entry->title,prevs->title) ) ) { /* string formatting is done here a.t.m. - TODO - improve this area */ - gchar *utf8_title = g_locale_to_utf8( pl_entry->title , -1 , NULL , NULL , NULL ); + gchar *utf8_title = str_to_utf8( pl_entry->title ); if ( g_utf8_validate( utf8_title , -1 , NULL ) == TRUE ) { gchar *utf8_title_markup = g_markup_printf_escaped(