changeset 4626:5ebedd1470c9

revert 4605. filename in tuple must be in "filename encoding".
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Wed, 11 Jun 2008 14:19:31 +0900
parents 8c36787807de
children f733f3d75850
files src/audacious/dbus.c
diffstat 1 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/dbus.c	Tue Jun 10 00:51:39 2008 +0200
+++ b/src/audacious/dbus.c	Wed Jun 11 14:19:31 2008 +0900
@@ -184,7 +184,7 @@
     TupleValueType type;
     type = tuple_get_value_type(tuple, -1, key);
     if (type == TUPLE_STRING) {
-        gchar *result = g_strdup(tuple_get_string(tuple, -1, key));
+        gchar *result = str_to_utf8(tuple_get_string(tuple, -1, key));
 
         val = g_new0(GValue, 1);
         g_value_init(val, G_TYPE_STRING);
@@ -707,7 +707,15 @@
 
 gboolean audacious_rc_song_filename(RemoteObject *obj, guint pos,
                                     gchar **filename, GError **error) {
-    *filename = playlist_get_filename(playlist_get_active(), pos);
+    gchar *tmp = NULL;
+    tmp = playlist_get_filename(playlist_get_active(), pos);
+
+    if(tmp){
+        *filename = str_to_utf8(tmp);
+    }
+    free(tmp);
+    tmp = NULL;
+
     return TRUE;
 }