light-locker-lid-closed-fixes.patch

Index: light-locker-1.8.0/src/gs-manager.c
===================================================================
--- light-locker-1.8.0.orig/src/gs-manager.c
+++ light-locker-1.8.0/src/gs-manager.c
@@ -626,7 +626,7 @@ gs_manager_activate (GSManager *manager)
 
         show_windows (manager->priv->windows);
 
-        if (manager->priv->visible && !manager->priv->blank && !manager->priv->closed) {
+        if (manager->priv->visible && !manager->priv->blank) {
                 gs_manager_timed_switch (manager);
         }
 
@@ -693,7 +693,7 @@ gs_manager_set_session_visible (GSManage
 {
         manager->priv->visible = visible;
 
-        if (manager->priv->active && visible && !manager->priv->blank && !manager->priv->closed) {
+        if (manager->priv->active && visible && !manager->priv->blank) {
                 gs_manager_timed_switch (manager);
         } else {
                 gs_manager_stop_switch (manager);
@@ -719,7 +719,7 @@ gs_manager_set_blank_screen (GSManager *
                 gs_manager_timed_lock (manager);
         } else {
                 gs_manager_stop_lock (manager);
-                if (manager->priv->active && manager->priv->visible && !manager->priv->closed) {
+                if (manager->priv->active && manager->priv->visible) {
                         gs_manager_timed_switch (manager);
                 }
         }
@@ -740,7 +740,7 @@ gs_manager_set_lid_closed (GSManager *ma
 {
         manager->priv->closed = closed;
 
-        if (manager->priv->active && manager->priv->visible && !manager->priv->blank && !closed) {
+        if (manager->priv->active && manager->priv->visible && !manager->priv->blank) {
                 gs_manager_timed_switch (manager);
         } else {
                 gs_manager_stop_switch (manager);
Index: light-locker-1.8.0/src/gs-monitor.c
===================================================================
--- light-locker-1.8.0.orig/src/gs-monitor.c
+++ light-locker-1.8.0/src/gs-monitor.c
@@ -275,10 +275,7 @@ listener_lock_cb (GSListener *listener,
                   GSMonitor  *monitor)
 {
         gs_monitor_lock_screen (monitor);
-        if (gs_listener_is_lid_closed (listener)) {
-                /* Don't switch VT while the lid is closed. */
-                monitor->priv->perform_lock = TRUE;
-        } else if (gs_manager_get_session_visible (monitor->priv->manager)) {
+        if (gs_manager_get_session_visible (monitor->priv->manager)) {
                 /* Add a 1s delay for VT switching.
                  * This seems to preserved content exposure.
                  */
@@ -344,20 +341,13 @@ listener_resume_cb (GSListener *listener
 {
         if (! monitor->priv->lock_on_suspend)
                 return;
-        if (gs_listener_is_lid_closed (monitor->priv->listener)) {
-                /* This will become a lock instead of a switch.
-                 * As a corner case this is ok.
-                 */
-                /* Don't switch VT while the lid is closed. */
-                monitor->priv->perform_lock = TRUE;
-        } else {
-                /* Add a 1s delay for resume to complete.
-                 * This seems to fix backlight issues.
-                 */
-                g_timeout_add_seconds (1,
-                                       (GSourceFunc)gs_monitor_switch_greeter,
-                                       monitor);
-        }
+
+        /* Add a 1s delay for resume to complete.
+         * This seems to fix backlight issues.
+         */
+        g_timeout_add_seconds (1,
+                               (GSourceFunc)gs_monitor_switch_greeter,
+                               monitor);
 }
 
 static void
@@ -427,22 +417,13 @@ listener_lid_closed_cb (GSListener *list
         if (! monitor->priv->lock_on_lid)
                 return;
 
-        if (closed)
-        {
-                /* Show the lock screen until lid open.
-                 * We lock the screen here even when the displaymanager didn't send the signal.
-                 * This means that need tell the displaymanager to lock the session before it can unlock.
-                 */
-                gs_monitor_lock_screen (monitor);
-        }
-        else
-        {
-                /* Add a 1s delay for resume to complete.
-                 * This seems to fix backlight issues.
-                 */
-                g_timeout_add_seconds (1,
-                                       (GSourceFunc)gs_monitor_switch_greeter,
-                                       monitor);
+        if (! closed) {
+             /* Add a 1s delay for resume to complete.
+             * This seems to fix backlight issues.
+             */
+            g_timeout_add_seconds (1,
+                                   (GSourceFunc)gs_monitor_switch_greeter,
+                                   monitor);
         }
 }