Fix xosd memleaks.

[vlc] / modules / misc / screensaver.c

diff --git a/modules/misc/screensaver.c b/modules/misc/screensaver.c
index 2d2bf7812e910f2d7e8e603cb8ac99d8ffa8ae80..782333070579c3580f586f2040fe25baae510777 100644 (file)
--- a/modules/misc/screensaver.c
+++ b/modules/misc/screensaver.c
@@ -47,7 +47,6 @@
 
 #ifdef HAVE_DBUS
 
-#define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
 
 #define GS_SERVICE   "org.gnome.ScreenSaver"
@@ -56,11 +55,6 @@
 
 #endif
 
-/* this is for dbus < 0.3 */
-#ifndef HAVE_DBUS_1
-#define dbus_bus_name_has_owner(connection, name, err) dbus_bus_service_exists(connection, name, err)
-#endif
-
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
@@ -123,11 +117,7 @@ static void Deactivate( vlc_object_t *p_this )
 
     if( p_intf->p_sys->p_connection )
     {
-#  ifdef HAVE_DBUS_2
         dbus_connection_unref( p_intf->p_sys->p_connection );
-#  else
-        dbus_connection_disconnect( p_intf->p_sys->p_connection );
-#  endif
     }
 
     free( p_intf->p_sys );