components/desktop/xscreensaver/patches/15-bug-15411287.patch
changeset 5400 1199f8e91f50
equal deleted inserted replaced
5399:88010dbde9bb 5400:1199f8e91f50
       
     1 15411287 SUNBT6583181 SCREENSAVER_STATUS needs to be set up correctly at startup
       
     2 
       
     3 Upstream applicability & status unknown.
       
     4 ---
       
     5  driver/xscreensaver.c |    2 ++
       
     6  1 files changed, 2 insertions(+), 0 deletions(-)
       
     7 
       
     8 diff --git a/driver/xscreensaver.c b/driver/xscreensaver.c
       
     9 --- a/driver/xscreensaver.c
       
    10 +++ b/driver/xscreensaver.c
       
    11 @@ -1577,6 +1577,7 @@ main (int argc, char **argv)
       
    12        if (ssi->real_screen_p)
       
    13          if (ensure_no_screensaver_running (si->dpy, si->screens[i].screen))
       
    14            exit (1);
       
    15 +      ssi->current_hack = -1; /* otherwise initialize hacks to no hack */
       
    16      }
       
    17  
       
    18    lock_initialization (si, &argc, argv);
       
    19 @@ -1611,6 +1612,7 @@ main (int argc, char **argv)
       
    20  
       
    21    make_splash_dialog (si);
       
    22  
       
    23 +  store_saver_status(si); /* set window property for SCREENSAVER_STATUS */
       
    24    main_loop (si);		/* doesn't return */
       
    25    return 0;
       
    26  }