Ticket #937: mplayer-gnome-screensaver.patch

configure

@@ -280 +280 @@
   --disable-ftp          disable FTP support [enabled]
   --disable-vstream      disable TiVo vstream client support [autodetect]
   --disable-pthreads     disable Posix threads support [autodetect]
+  --disable-dbus-glib    disable D-BUS GLib interface (required for GNOME screensaver support) [autodetect]
   --disable-w32threads   disable Win32 threads support [autodetect]
   --disable-ass          disable internal SSA/ASS subtitle support [autodetect]
   --enable-rpath         enable runtime linker path for extra libs [disabled]
@@ -673 +674 @@
 _vstream=auto
 _pthreads=auto
 _w32threads=auto
+_dbus_glib=auto
 _ass=auto
 _rpath=no
 _asmalign_pot=auto
@@ -1112 +1114 @@
   --disable-pthreads)   _pthreads=no    ;;
   --enable-w32threads)  _w32threads=yes ;;
   --disable-w32threads) _w32threads=no  ;;
+  --enable-dbus-glib)   _dbus_glib=yes  ;;
+  --disable-dbus-glib)  _dbus_glib=no   ;;
   --enable-ass)         _ass=yes        ;;
   --disable-ass)        _ass=no         ;;
   --enable-rpath)       _rpath=yes      ;;
@@ -3761 +3765 @@
 fi
 echores "$_tga"
 
+echocheck "D-BUS GLib interface"
+if test "$_dbus_glib" = auto && pkg-config --exists dbus-glib-1; then
+  _dbus_glib=yes
+  _vosrc="$_vosrc gnome_screensaver.c"
+  _vomodules="gnome_screensaver $_vomodules"
+  _inc_extra="$_inc_extra `pkg-config --cflags dbus-glib-1 2>/dev/null`"
+  _ld_extra="$_ld_extra `pkg-config --libs dbus-glib-1 2>/dev/null`"
+fi
+
+if test "$_dbus_glib" = yes; then
+  _def_dbus_glib='#define HAVE_DBUS_GLIB 1'
+else
+  _def_dbus_glib='#undef HAVE_DBUS_GLIB'
+fi
+echores "$_dbus_glib"
 
 echocheck "md5sum support"
 if test "$_md5sum" = yes; then
@@ -7171 +7190 @@
 fi
 echores "$_gethostbyname2"
 
-
 # --------------- GUI specific tests begin -------------------
 echocheck "GUI"
 echo "$_gui"
@@ -8496 +8514 @@
 $_def_tga
 $_def_toolame
 $_def_twolame
+$_def_dbus_glib
 
 /* used by GUI: */
 $_def_xshape

help/help_mp-en.h

@@ -711 +711 @@
 #define MSGTR_NoVolume "[Mixer] No volume control available.\n"
 #define MSGTR_NoBalance "[Mixer] No balance control available.\n"
 
+// gnome_screensaver.c
+#define MSGTR_OpenBusConnectionError "%s: Failed to open connection to bus: %s\n"
+#define MSGTR_RemoteMethodException "%s: Caught remote method exception %s: %s\n"
+#define MSGTR_GError "%s: Error: %s\n"
+#define MSGTR_GNOMEScreensaverEnabled "GNOME screensaver enabled\n"
+#define MSGTR_GNOMEScreensaverDisabled "GNOME screensaver disabled\n"
+
 // ====================== GUI messages/buttons ========================
 
 #ifdef HAVE_NEW_GUI

libvo/x11_common.c

@@ -58 +58 @@
 #include "mplayer.h"
 #endif
 
+#ifdef HAVE_DBUS_GLIB
+#include "gnome_screensaver.h"
+#endif
+
 #define WIN_LAYER_ONBOTTOM               2
 #define WIN_LAYER_NORMAL                 4
 #define WIN_LAYER_ONTOP                  6
@@ -1755 +1759 @@
     }
 
     if (stop_xscreensaver)
+    {
         xscreensaver_enable();
+        #ifdef HAVE_DBUS_GLIB
+        gnome_screensaver_control(1);
+        #endif
+    }
     if (kdescreensaver_was_running && stop_xscreensaver)
     {
         system
@@ -1801 +1810 @@
     }
     // turning off screensaver
     if (stop_xscreensaver)
+    {
         xscreensaver_disable(mDisplay);
+        #ifdef HAVE_DBUS_GLIB
+        gnome_screensaver_control(0);
+        #endif
+    }
     if (stop_xscreensaver && !kdescreensaver_was_running)
     {
         kdescreensaver_was_running =