Mercurial > audlegacy

changeset 4636:f6204058f034

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.atheme.org//hg/audacious
author Matti Hamalainen <ccr@tnsp.org>
date Fri, 13 Jun 2008 05:03:11 +0300
parents 1e3d9707ae50 (diff) ca64cd387021 (current diff)
children 8510e7d242f0
files
diffstat 2 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/dbus.c	Wed Jun 11 18:32:35 2008 +0300
+++ b/src/audacious/dbus.c	Fri Jun 13 05:03:11 2008 +0300
@@ -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;
 }
 
--- a/src/audtool/Makefile	Wed Jun 11 18:32:35 2008 +0300
+++ b/src/audtool/Makefile	Fri Jun 13 05:03:11 2008 +0300
@@ -18,6 +18,8 @@
 		  ${ARCH_DEFINES}		\
 		  ${MOWGLI_CFLAGS}
 
+LDFLAGS += ${AUDLDFLAGS}
+
 LIBS += ${DBUS_LIBS}				\
 	-L../libaudclient -laudclient	\
 	${GTK_LIBS}						\