changeset 4634:1e3d9707ae50

backout 4626. there was no relevance to the bug I was chasing.
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Thu, 12 Jun 2008 14:04:51 +0900
parents 3d5862f6c6c4
children f6204058f034
files src/audacious/dbus.c
diffstat 1 files changed, 2 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/dbus.c	Thu Jun 12 13:42:09 2008 +0900
+++ b/src/audacious/dbus.c	Thu Jun 12 14:04:51 2008 +0900
@@ -196,7 +196,7 @@
     TupleValueType type;
     type = tuple_get_value_type(tuple, -1, key);
     if (type == TUPLE_STRING) {
-        gchar *result = str_to_utf8(tuple_get_string(tuple, -1, key));
+        gchar *result = g_strdup(tuple_get_string(tuple, -1, key));
 
         val = g_new0(GValue, 1);
         g_value_init(val, G_TYPE_STRING);
@@ -698,15 +698,7 @@
 
 gboolean audacious_rc_song_filename(RemoteObject *obj, guint pos,
                                     gchar **filename, GError **error) {
-    gchar *tmp = NULL;
-    tmp = playlist_get_filename(playlist_get_active(), pos);
-
-    if(tmp){
-        *filename = str_to_utf8(tmp);
-    }
-    free(tmp);
-    tmp = NULL;
-
+    *filename = playlist_get_filename(playlist_get_active(), pos);
     return TRUE;
 }