# HG changeset patch
# User Ben Tucker <ben.tucker@gmail.com>
# Date 1185429770 25200
# Node ID 3d740a3c5e16ede9f5c4c0150545d96c72b3add1
# Parent  ee8a1ed308268f5f22c75226ca89b1714fbc6260
-Fixed a compilation issue with DBus on Mac
-Changed MPRIS service name to org.mpris.audacios to conform to spec.

diff -r ee8a1ed30826 -r 3d740a3c5e16 src/audacious/Makefile
--- a/src/audacious/Makefile	Wed Jul 25 19:10:53 2007 -0500
+++ b/src/audacious/Makefile	Wed Jul 25 23:02:50 2007 -0700
@@ -142,7 +142,7 @@
 CFLAGS += -I../libaudclient
 DBUS_BINDINGS = dbus-server-bindings.h dbus-client-bindings.h
 OBJECTIVE_LIBS_NOINST += $(DBUS_BINDINGS)
-LIBDEP += ../libaudclient/libaudclient.so
+LIBDEP += ../libaudclient/libaudclient$(SHARED_SUFFIX)
 LDADD += -L../libaudclient -laudclient
 endif
 
diff -r ee8a1ed30826 -r 3d740a3c5e16 src/audacious/dbus-service.h
--- a/src/audacious/dbus-service.h	Wed Jul 25 19:10:53 2007 -0500
+++ b/src/audacious/dbus-service.h	Wed Jul 25 23:02:50 2007 -0700
@@ -28,6 +28,7 @@
 
 typedef struct {
     GObject parent;
+	DBusGProxy *proxy;
 } RemoteObject, MprisRoot, MprisPlayer, MprisTrackList;
 
 typedef struct {
diff -r ee8a1ed30826 -r 3d740a3c5e16 src/audacious/dbus.h
--- a/src/audacious/dbus.h	Wed Jul 25 19:10:53 2007 -0500
+++ b/src/audacious/dbus.h	Wed Jul 25 23:02:50 2007 -0700
@@ -24,7 +24,8 @@
 #define AUDACIOUS_DBUS_SERVICE      "org.atheme.audacious"
 #define AUDACIOUS_DBUS_PATH         "/org/atheme/audacious"
 #define AUDACIOUS_DBUS_INTERFACE    "org.atheme.audacious"
-#define AUDACIOUS_DBUS_SERVICE_MPRIS    "org.freedesktop.MediaPlayer"
+#define AUDACIOUS_DBUS_SERVICE_MPRIS    "org.mpris.audacious"
+#define AUDACIOUS_DBUS_INTERFACE_MPRIS 	"org.freedesktop.MediaPlayer"
 #define AUDACIOUS_DBUS_PATH_MPRIS_ROOT      "/"
 #define AUDACIOUS_DBUS_PATH_MPRIS_PLAYER    "/Player"
 #define AUDACIOUS_DBUS_PATH_MPRIS_TRACKLIST "/TrackList"