Do not try to read metadata if it's not present

[vlc] / modules / misc / screensaver.c

diff --git a/modules/misc/screensaver.c b/modules/misc/screensaver.c
index 3983518df25e83f1f2e8d93160bdd6602f1aeb5d..dedd70243239acf9363b6be39e4d743f2d51dadd 100644 (file)
--- a/modules/misc/screensaver.c
+++ b/modules/misc/screensaver.c
@@ -28,9 +28,10 @@
 #include <stdlib.h>
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/aout.h>
-#include <vlc/vout.h>
+#include <vlc_input.h>
+#include <vlc_interface.h>
+#include <vlc_aout.h>
+#include <vlc_vout.h>
 
 #ifdef HAVE_DBUS
 
@@ -208,7 +209,10 @@ static void poke_screensaver( intf_thread_t *p_intf,
 #   ifdef SCREENSAVER_DEBUG
         msg_Dbg( p_intf, "found a running gnome-screensaver instance" );
 #   endif
+        /* gnome-screensaver changed it's D-Bus interface, so we need both */
         screensaver_send_message_void( p_intf, p_connection, "Poke" );
+        screensaver_send_message_void( p_intf, p_connection, 
+                "SimulateUserActivity" );
     }
 #   ifdef SCREENSAVER_DEBUG
     else