Move the MPRIS Quit method to the root dbus object.

This closes #1565

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index 1bfe3a767b3c978e958b5438149d76d5be041a81..2eae9d128b2d5bc6e81ec9068a43b8e274829c0e 100644 (file)
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -632,6 +632,7 @@ DBUS_METHOD( handle_root )
 
     METHOD_FUNC( "Identity",                Identity );
     METHOD_FUNC( "MprisVersion",            MprisVersion );
+    METHOD_FUNC( "Quit",                    Quit );
 
     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 }
@@ -647,7 +648,6 @@ DBUS_METHOD( handle_player )
 
     METHOD_FUNC( "Prev",                    Prev );
     METHOD_FUNC( "Next",                    Next );
-    METHOD_FUNC( "Quit",                    Quit );
     METHOD_FUNC( "Stop",                    Stop );
     METHOD_FUNC( "Play",                    Play );
     METHOD_FUNC( "Pause",                   Pause );

diff --git a/modules/control/dbus.h b/modules/control/dbus.h
index 7e8864a5aff137dbb3a6ed727d87c9237ba1d64d..df74bc31fdcedd07658750ca1ee3f66e53853780 100644 (file)
--- a/modules/control/dbus.h
+++ b/modules/control/dbus.h
@@ -101,6 +101,8 @@ const char* psz_introspection_xml_data_root =
 "    <method name=\"MprisVersion\">\n"
 "      <arg type=\"(qq)\" direction=\"out\" />\n"
 "    </method>\n"
+"    <method name=\"Quit\">\n"
+"    </method>\n"
 "  </interface>\n"
 "</node>\n"
 ;
@@ -118,8 +120,6 @@ const char* psz_introspection_xml_data_player =
 "    <method name=\"GetStatus\">\n"
 "      <arg type=\"(iiii)\" direction=\"out\" />\n"
 "    </method>\n"
-"    <method name=\"Quit\">\n"
-"    </method>\n"
 "    <method name=\"Prev\">\n"
 "    </method>\n"
 "    <method name=\"Next\">\n"