[Xfce4-commits] [apps/xfce4-screensaver] 01/01: Fix screensaver-only mode, lock screen to screensaver instead of directly to unlock dialog

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/xfce4-screensaver.

commit b8d36448cb444913705a2f688c77aafe35c1dad8
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Thu Nov 8 23:06:36 2018 -0500

    Fix screensaver-only mode, lock screen to screensaver instead of directly to unlock dialog
---
 src/gs-manager.c | 15 +--------------
 src/gs-monitor.c |  9 +--------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/src/gs-manager.c b/src/gs-manager.c
index 2e312e1..eaed5b5 100644
--- a/src/gs-manager.c
+++ b/src/gs-manager.c
@@ -464,13 +464,7 @@ gs_manager_set_lock_active (GSManager *manager,
 
     if (manager->priv->lock_active != lock_active)
     {
-        GSList *l;
-
         manager->priv->lock_active = lock_active;
-        for (l = manager->priv->windows; l; l = l->next)
-        {
-            gs_window_set_lock_enabled (l->data, lock_active);
-        }
     }
 }
 
@@ -1152,7 +1146,6 @@ gs_manager_show_message (GSManager  *manager,
     /* Find the GSWindow that contains the pointer */
     window = find_window_at_pointer (manager);
     gs_window_show_message (window, summary, body, icon);
-
     gs_manager_request_unlock (manager);
 }
 
@@ -1369,11 +1362,6 @@ window_obscured_cb (GSWindow   *window,
     gs_debug ("Handling window obscured: %s", obscured ? "obscured" : "unobscured");
 
     maybe_set_window_throttle (manager, window, obscured);
-
-    if (! obscured)
-    {
-        gs_manager_request_unlock (manager);
-    }
 }
 
 static void
@@ -1473,7 +1461,6 @@ window_activity_cb (GSWindow  *window,
                     GSManager *manager)
 {
     gboolean handled;
-
     handled = gs_manager_request_unlock (manager);
 
     return handled;
@@ -1539,7 +1526,7 @@ gs_manager_create_window_for_monitor (GSManager  *manager,
     gs_debug ("Creating a window [%d,%d] (%dx%d)",
               rect.x, rect.y, rect.width, rect.height);
 
-    window = gs_window_new (monitor, manager->priv->lock_active);
+    window = gs_window_new (monitor, manager->priv->lock_enabled);
 
     gs_window_set_user_switch_enabled (window, manager->priv->user_switch_enabled);
     gs_window_set_logout_enabled (window, manager->priv->logout_enabled);
diff --git a/src/gs-monitor.c b/src/gs-monitor.c
index 2c0d5f0..9b20f4a 100644
--- a/src/gs-monitor.c
+++ b/src/gs-monitor.c
@@ -130,14 +130,7 @@ static void listener_lock_cb(GSListener* listener, GSMonitor* monitor)
 
 static void listener_x11_lock_cb(GSListenerX11* listener, GSMonitor* monitor)
 {
-    if (monitor->priv->prefs->lock_enabled)
-    {
-        gs_monitor_lock_screen(monitor);
-    }
-    else
-    {
-        gs_debug("Locking disabled by the administrator");
-    }
+    gs_monitor_lock_screen(monitor);
 }
 
 static void listener_quit_cb(GSListener* listener, GSMonitor* monitor)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.