[Xfce4-commits] [apps/xfce4-screensaver] 07/17: Revert "Remove 1 second delay before before showing lock screen"

[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 f573f2d77075a840bb0f7b4108e9fa7a06270274
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Tue Feb 5 22:56:20 2019 -0400

    Revert "Remove 1 second delay before before showing lock screen"
    
    This reverts commit d6c392a915795a75adcd84ef0043ae4d671a18bd.
---
 src/gs-window-x11.c            | 1 -
 src/xfce4-screensaver-dialog.c | 3 ++-
 src/xfce4-screensaver.c        | 2 --
 src/xfcekbd-indicator.c        | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index a4f7da2..7de9330 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -1593,7 +1593,6 @@ popup_dialog (GSWindow *window) {
     window->priv->dialog_quit_requested = FALSE;
     window->priv->dialog_shake_in_progress = FALSE;
 
-    gs_debug ("Executing %s", command->str);
     result = spawn_on_window (window,
                               command->str,
                               &window->priv->lock_pid,
diff --git a/src/xfce4-screensaver-dialog.c b/src/xfce4-screensaver-dialog.c
index 9678659..c3c674a 100644
--- a/src/xfce4-screensaver-dialog.c
+++ b/src/xfce4-screensaver-dialog.c
@@ -299,6 +299,8 @@ static gboolean do_auth_check(GSLockPlug* plug) {
 
     error = NULL;
 
+    gs_lock_plug_disable_prompt(plug);
+    gs_lock_plug_set_busy(plug);
     res = gs_auth_verify_user(g_get_user_name(), g_getenv("DISPLAY"), auth_message_handler, plug, &error);
 
     gs_debug("Verify user returned: %s", res ? "TRUE" : "FALSE");
@@ -416,7 +418,6 @@ static gboolean popup_dialog_idle(void) {
                                                GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
     gtk_widget_realize(widget);
-    gtk_widget_show(widget);
 
     g_idle_add((GSourceFunc) auth_check_idle, widget);
 
diff --git a/src/xfce4-screensaver.c b/src/xfce4-screensaver.c
index 83e0fc7..9f7d9a7 100644
--- a/src/xfce4-screensaver.c
+++ b/src/xfce4-screensaver.c
@@ -61,8 +61,6 @@ int main(int    argc,
         {NULL}
     };
 
-    g_setenv ("GTK_THEME", "Greybird", TRUE);
-
     #ifdef ENABLE_NLS
         bindtextdomain(GETTEXT_PACKAGE, XFCELOCALEDIR);
         #ifdef HAVE_BIND_TEXTDOMAIN_CODESET
diff --git a/src/xfcekbd-indicator.c b/src/xfcekbd-indicator.c
index 3457476..d4bdf02 100644
--- a/src/xfcekbd-indicator.c
+++ b/src/xfcekbd-indicator.c
@@ -452,7 +452,7 @@ xfcekbd_indicator_filter_x_evt (GdkXEvent *xev,
     switch (xevent->type) {
         case ReparentNotify:
             {
-                //if (!globals.redraw_queued)
+                if (!globals.redraw_queued)
                     return GDK_FILTER_CONTINUE;
 
                 XReparentEvent *rne = (XReparentEvent *) xev;

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