changeset 887:2a0f31ee4501 trunk

[svn] aosd: use g_locale_to_utf8 for osd strings (needs testing)
author giacomo
date Wed, 21 Mar 2007 07:24:33 -0700
parents f2fde7b4dccd
children 7e24265fe540
files ChangeLog src/aosd/aosd_trigger.c
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Mar 21 07:15:43 2007 -0700
+++ b/ChangeLog	Wed Mar 21 07:24:33 2007 -0700
@@ -1,3 +1,12 @@
+2007-03-21 14:15:43 +0000  Giacomo Lozito <james@develia.org>
+  revision [1872]
+  - statusicon: use function/define names that do not collide with gtk >= 2.10 internals (paranoia)
+  trunk/src/statusicon/gtktrayicon-x11.c |  166 ++++++++++++++++-----------------
+  trunk/src/statusicon/gtktrayicon.h     |   42 ++++----
+  trunk/src/statusicon/si_ui.c           |   12 +-
+  3 files changed, 110 insertions(+), 110 deletions(-)
+
+
 2007-03-21 12:18:25 +0000  Giacomo Lozito <james@develia.org>
   revision [1870]
   - alsa: handle errors on snd_pcm_wait (xrun, supend)
--- a/src/aosd/aosd_trigger.c	Wed Mar 21 07:15:43 2007 -0700
+++ b/src/aosd/aosd_trigger.c	Wed Mar 21 07:24:33 2007 -0700
@@ -163,7 +163,7 @@
       gint pos = playlist_get_position(active);
       title = playlist_get_songtitle(active, pos);
     }
-    gchar *utf8_title = g_strdup( title );
+    gchar *utf8_title = g_locale_to_utf8( title , -1 , NULL , NULL , NULL );
     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_strdup( pl_entry->title );
+          gchar *utf8_title = g_locale_to_utf8( pl_entry->title , -1 , NULL , NULL , NULL );
           if ( g_utf8_validate( utf8_title , -1 , NULL ) == TRUE )
           {
             gchar *utf8_title_markup = g_markup_printf_escaped(