Merge branch 'release-1.1'

event_screensaver

@@ -1,7 +1,18 @@
 #!/bin/sh
 
+is_screen_locked()
+{
+  if dbus-send --session --dest=org.freedesktop.ScreenSaver --type=method_call --print-reply /org/freedesktop/ScreenSaver org.freedesktop.ScreenSaver.GetActive | grep 'boolean true' > /dev/null; then
+    return 0
+  else
+    return 1
+  fi
+}
+
 # Sleep to timeout
 sleep 15
 
+if is_screen_locked; then
     # Disable screens
     xset dpms force off
+fi