# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_interface.h>
#ifdef HAVE_DBUS
-#define DBUS_API_SUBJECT_TO_CHANGE
#include <dbus/dbus.h>
#define GS_SERVICE "org.gnome.ScreenSaver"
#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
*****************************************************************************/
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("X Screensaver disabler") );
+ set_description( N_("X Screensaver disabler") );
set_capability( "interface", 0 );
set_callbacks( Activate, Deactivate );
vlc_module_end();
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 );
*****************************************************************************/
static void Run( intf_thread_t *p_intf )
{
- vlc_object_lock( p_intf );
+ mtime_t deadline = mdate();
+ vlc_object_lock( p_intf );
#ifdef HAVE_DBUS
p_intf->p_sys->p_connection = dbus_init( p_intf );
#endif
{
vlc_object_t *p_vout;
- /* Check screensaver every 30 seconds */
- if( vlc_object_timedwait( p_intf, mdate() + 30000000 ) < 0 )
+ if( vlc_object_timedwait( p_intf, deadline ) == 0 )
continue;
p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
vlc_object_release( p_input );
}
}
+
+ /* Check screensaver every 30 seconds */
+ deadline = mdate() + 30000000;
}
vlc_object_unlock( p_intf );
}