[vlc-commits] dbus: really remove the configuration option

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Feb  6 22:45:55 2012 +0200| [8635ad7c688857744722c05b34544374bad9b98b] | committer: Jean-Baptiste Kempf

dbus: really remove the configuration option

(The previous commit only made it inoperant)
(cherry picked from commit d9f36235b8671491e6ec14c0ce4bbce337bcdc06)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=8635ad7c688857744722c05b34544374bad9b98b
---

 modules/control/dbus/dbus.c |    7 -------
 1 file changed, 7 deletions(-)

diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
index cb520f1..96d720b 100644
--- a/modules/control/dbus/dbus.c
+++ b/modules/control/dbus/dbus.c
@@ -134,11 +134,6 @@ static void DispatchDBusMessages( intf_thread_t *p_intf );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define DBUS_UNIQUE_TEXT N_("Unique DBUS service id (org.mpris.vlc-<pid>)")
-#define DBUS_UNIQUE_LONGTEXT N_( \
-    "Use a unique dbus service id to identify this VLC instance on the DBUS bus. " \
-    "The process identifier (PID) is added to the service name: org.mpris.vlc-<pid>" )
-
 vlc_module_begin ()
     set_shortname( N_("DBus"))
     set_category( CAT_INTERFACE )
@@ -146,8 +141,6 @@ vlc_module_begin ()
     set_description( N_("D-Bus control interface") )
     set_capability( "interface", 0 )
     set_callbacks( Open, Close )
-    add_bool( "dbus-unique-service-id", false,
-              DBUS_UNIQUE_TEXT, DBUS_UNIQUE_LONGTEXT, true )
 vlc_module_end ()
 
 /*****************************************************************************