Merge upstream commits

ya

.github/CONTRIBUTING.md

@@ -0,0 +1,3 @@
+Please do not send/request features related to image manipulation. i3lock’s
+support for background images is intentionally kept minimal, you should do all
+pre-processing in external tools.

CHANGELOG

@@ -1,3 +1,15 @@
+2016-06-04 i3lock 2.8
+
+ • Remove DPMS support in favor of a wrapper script and xset(1).
+ • Indicate that the --inactivity-timeout option takes an argument. (Thanks
+   Kenneth Lyons)
+ • fix pam_securetty: set PAM_TTY to getenv("DISPLAY")
+ • Eat XKB_KEY_Delete and XKB_KEY_KP_Delete (Thanks bebehei)
+ • Show unlock indicator if password was entered during PAM verification
+ • Allow CTRL+J as enter and CTRL+H as backspace (Thanks Karl Tarbe)
+ • Flush xcb connection after opening fullscreen window (Thanks martin)
+ • Add support for `xss-lock --transfer-sleep-lock'
+
 2015-05-20 i3lock 2.7
 
  • Die when the X11 connection breaks during runtime (Thanks Eduan)

i3lock.c

@@ -666,10 +666,10 @@ static void maybe_close_sleep_lock_fd(void) {
     const char *sleep_lock_fd = getenv("XSS_SLEEP_LOCK_FD");
     char *endptr;
     if (sleep_lock_fd && *sleep_lock_fd != 0) {
-         long int fd = strtol(sleep_lock_fd, &endptr, 10);
+        long int fd = strtol(sleep_lock_fd, &endptr, 10);
-         if (*endptr == 0) {
+        if (*endptr == 0) {
-             close(fd);
+            close(fd);
-         }
+        }
     }
 }