# HG changeset patch
# User Ben Tucker <ben.tucker@gmail.com>
# Date 1186895833 25200
# Node ID 904c58081f0a67e51057ddd08ce284fcbdb9cba8
# Parent  63d7947d73760fe211f9c5164e2b7c7dc8d8831b
removed Disconnect method and Disconnected signal as they have been removed from the spec.

diff -r 63d7947d7376 -r 904c58081f0a src/audacious/dbus-service.h
--- a/src/audacious/dbus-service.h	Sat Aug 11 20:32:13 2007 +0200
+++ b/src/audacious/dbus-service.h	Sat Aug 11 22:17:13 2007 -0700
@@ -53,7 +53,6 @@
 gboolean mpris_player_play(MprisPlayer *obj, GError **error);
 gboolean mpris_player_repeat(MprisPlayer *obj, gboolean rpt, GError **error);
 gboolean mpris_player_quit(MprisPlayer *obj, GError **error);
-gboolean mpris_player_disconnect(MprisPlayer *obj, GError **error);
 gboolean mpris_player_get_status(MprisPlayer *obj, gint *status,
                                  GError **error);
 gboolean mpris_player_get_metadata(MprisTrackList *obj, gint pos,
@@ -70,13 +69,11 @@
     TRACK_CHANGE_SIG,
     STATUS_CHANGE_SIG,
     CAPS_CHANGE_SIG,
-    DISCONNECTED,
     LAST_SIG
 };
 gboolean mpris_player_emit_track_change(MprisPlayer *obj, GError **error);
 gboolean mpris_player_emit_status_change(MprisPlayer *obj, GError **error);
 gboolean mpris_player_emit_caps_change(MprisPlayer *obj, GError **error);
-gboolean mpris_player_emit_disconnected(MprisPlayer *obj, GError **error);
 
 // MPRIS /TrackList
 gboolean mpris_tracklist_get_metadata(MprisTrackList *obj, gint pos,
diff -r 63d7947d7376 -r 904c58081f0a src/audacious/dbus.c
--- a/src/audacious/dbus.c	Sat Aug 11 20:32:13 2007 +0200
+++ b/src/audacious/dbus.c	Sat Aug 11 22:17:13 2007 -0700
@@ -208,13 +208,9 @@
     return TRUE;
 }
 gboolean mpris_player_quit(MprisPlayer *obj, GError **error) {
-	// TODO: emit disconnected signal
 	mainwin_quit_cb();
     return TRUE;
 }
-gboolean mpris_player_disconnect(MprisPlayer *obj, GError **error) {
-	return FALSE;
-}
 gboolean mpris_player_get_status(MprisPlayer *obj, gint *status,
                                  GError **error) {
     return FALSE;
@@ -258,11 +254,6 @@
     return TRUE;
 }
 
-gboolean mpris_player_emit_disconnected(MprisPlayer *obj, GError **error) {
-	g_signal_emit(obj, signals[DISCONNECTED], 0, NULL);
-	return TRUE;
-}
-
 // MPRIS /TrackList
 gboolean mpris_tracklist_get_metadata(MprisTrackList *obj, gint pos,
                                       GHashTable *metadata, GError **error) {
diff -r 63d7947d7376 -r 904c58081f0a src/audacious/mpris_player.xml
--- a/src/audacious/mpris_player.xml	Sat Aug 11 20:32:13 2007 +0200
+++ b/src/audacious/mpris_player.xml	Sat Aug 11 22:17:13 2007 -0700
@@ -42,9 +42,6 @@
         <method name="Quit">
             <annotation name="org.freedesktop.DBus.GLib.NoReply" value=""/>
         </method>
-        <method name="Disconnect">
-            <annotation name="org.freedesktop.DBus.GLib.NoReply" value=""/>
-        </method>
         <method name="GetStatus">
             <arg type="i" direction="out" />
         </method>
@@ -78,6 +75,5 @@
         <signal name="CapsChange">
             <arg type="i" />
         </signal>
-		<signal name="Disconnected" />
     </interface>
 </node>