Merge lp:~vikoadi/pantheon-greeter/manage-screensaver into lp:~elementary-pantheon/pantheon-greeter/trunk

[Viko Adi Rahmawan]

manage screensaver so that display will turned off after delay
* set delay to 60 on startup
* add org.pantheon.desktop.greeter screensaver-timeout to set delay when greeter used as lockscreen
* restore user screensaver delay on login
* use /etc/lightdm/pantheon-greeter.conf instead of GLib.Gsettings

manage screensaver so that display will turned off after delay
* set delay to 60 on startup
* add org.pantheon.desktop.greeter screensaver-timeout to set delay when greeter used as lockscreen
* restore user screensaver delay on login
* use /etc/lightdm/pantheon-greeter.conf instead of GLib.Gsettings

[Cameron Norman (cameronnemo)]

Soooooooo when does this take effect? At the lock screen or in the normal pantheon session? Like if I just leave my computer without locking it the screen turns off after 60 seconds? Or if the computer is locked then after 60 seconds the screen turns off? Or both?

[Viko Adi Rahmawan (vikoadi)]

> Soooooooo when does this take effect? At the lock screen or in the normal
> pantheon session?
This only handle timeout in Pantheon greeter. it will have no effect in normal mode.

the "startup " i meant at description of change is pantheon-greeter's startup

> Like if I just leave my computer without locking it the
> screen turns off after 60 seconds?

No

> Or if the computer is locked then after 60
> seconds the screen turns off? Or both?

only turn off the screen on locker

after testing i still found something which doesnt work like i supposed it to:
* it can't get user gsetting's timeout, only the system default. so i can't change from 60 seconds timeout.
* saving and restoring normal timeout is still hit and miss

[Raphael Isemann (teemperor)]

Yeah accessing gsettings from other users is the big problem with the
greeter. Only clean way is to extend accountsservices (which is a PITA).
Am 15.12.2014 03:43 schrieb "Viko Adi Rahmawan" <email address hidden>:

> > Soooooooo when does this take effect? At the lock screen or in the normal
> > pantheon session?
> This only handle timeout in Pantheon greeter. it will have no effect in
> normal mode.
>
> the "startup " i meant at description of change is pantheon-greeter's
> startup
>
> > Like if I just leave my computer without locking it the
> > screen turns off after 60 seconds?
>
> No
>
> > Or if the computer is locked then after 60
> > seconds the screen turns off? Or both?
>
> only turn off the screen on locker
>
> after testing i still found something which doesnt work like i supposed it
> to:
> * it can't get user gsetting's timeout, only the system default. so i
> can't change from 60 seconds timeout.
> * saving and restoring normal timeout is still hit and miss
> --
>
> https://code.launchpad.net/~vikoadi/pantheon-greeter/manage-screensaver/+merge/244680
> Your team elementary Pantheon team is requested to review the proposed
> merge of lp:~vikoadi/pantheon-greeter/manage-screensaver into
> lp:pantheon-greeter.
>

[Viko Adi Rahmawan (vikoadi)]

Thanks,
So let just leave it to distro packaging to set their timeout, it's not supposed to be per-user setting anyway.

* and for saving and restoring timeout, I found out that lightdm-gtk-greeter behave the same, so this is the farthest i can get.

review: Needs Resubmitting

[PerfectCarl (name-is-carl)]

should this mp be tested ?

[Cody Garver (codygarver)]

I've tested it and it seems to work fine.

The only thing I don't like is that, in my opinion, this is a misuse to gsettings because only root's entry setting is respected. Like, maybe this timeout should be set somewhere like /etc/pantheon-greeter.conf

[Tom Beckmann (tombeckmann)]

Wouldn't it be possible to make light-locker do the x screen saver calls? Or maybe cerbere? This would allow us to read local settings. No idea about other implications though.

[Viko Adi Rahmawan (vikoadi)]

sorry for the late answer

@Cody: yeah, I'll try to use keyfile instead of gsettings for all pantheon-greeter settings

@Tom: Honestly i don't really know how light-locker works, i just recreate how lightdm-gtk-greeter works, and as teemperor said using AccountService is PITA

[Viko Adi Rahmawan (vikoadi)]

use /etc/lightdm/pantheon-greeter.conf instead of GLib.Settings

review: Needs Resubmitting

[Cody Garver (codygarver)]

All the options are commented out, but I uncommented to test them.

high-contrast=true - can't tell if this works or not
onscreen-keyboard=true - did not work
screensaver-timeout=5 - did not work

[Cody Garver (codygarver)]

Fails to start on an .iso I have already linked viko and teemperor privately. Here's the log:

** Message: PantheonGreeter.vala:329: Starting pantheon-greeter...
** Message: PantheonGreeter.vala:338: Applying settings...
** Message: Authenticator.vala:166: Connecting to LightDM...
** Message: Authenticator.vala:175: Successfully connected to LightDM.
** Message: PantheonGreeter.vala:95: Loading default-avatar...
** Message: PantheonGreeter.vala:98: Building UI...

(pantheon-greeter:1225): libindicator-WARNING **: File '/usr/lib/indicators3/7/libpower.so' does not exist.

(pantheon-greeter:1225): libindicator-WARNING **: File '/usr/lib/indicators3/7/libsoundmenu.so' does not exist.

(pantheon-greeter:1225): Gtk-WARNING **: Attempting to add a widget with type GtkBox to a KeyboardLayoutMenu, but as a GtkBin subclass a KeyboardLayoutMenu can only contain one widget at a time; it already contains a widget of type GtkImage

** (pantheon-greeter:1225): WARNING **: AccessibilityMenu.vala:26: Key file does not have key 'onscreen-keyboard'

** (pantheon-greeter:1225): WARNING **: AccessibilityMenu.vala:43: Key file does not have key 'high-contrast'

** (pantheon-greeter:1225): WARNING **: AccessibilityMenu.vala:53: Key file does not have key 'onscreen-keyboard'
** Message: PantheonGreeter.vala:111: Connecting signals...

(pantheon-greeter:1225): GLib-GIO-ERROR **: Settings schema 'org.pantheon.desktop.greeter' is not installed

However, org.pantheon.desktop.greeter does actually exist.

review: Needs Fixing

[lp:~vikoadi/pantheon-greeter/manage-screensaver]

350. By Viko Adi Rahmawan on 2015-02-06

clean remaining gsetting dependency

[Viko Adi Rahmawan (vikoadi)]

@cody: can you please try latest revisions on top of the broken iso installation
thanks

[Cody Garver (codygarver)]

Seems to work now but needs conflicts resolved

[Raphael Isemann (teemperor)]

Just saying that the keyfile could break the testing mode as only root/lightdm can write to that keyfile (and the testing mode is done as a normal user).

[Viko Adi Rahmawan (vikoadi)]

@teemperor: pantheon-greeter doesn't crash, but ofcourse does'nt write to the keyfile, is that good enaough or should we write to a local .config keyfile?

=== added file 'data/pantheon-greeter.conf.OTHER'
--- data/pantheon-greeter.conf.OTHER	1970-01-01 00:00:00 +0000
+++ data/pantheon-greeter.conf.OTHER	2015-02-06 16:12:08 +0000
@@ -0,0 +1,6 @@
+[greeter]
+#activate-numlock=true
+#default-wallpaper=/usr/share/backgrounds/elementaryos-default
+#high-contrast=false
+#onscreen-keyboard=false
+#screensaver-timeout=60

=== modified file 'src/PantheonGreeter.vala'
--- src/PantheonGreeter.vala	2015-02-06 00:05:13 +0000
+++ src/PantheonGreeter.vala	2015-02-06 16:12:08 +0000
@@ -57,7 +57,17 @@
             login_gateway = new LightDMGateway ();
         }
 
+<<<<<<< TREE
         settings = new Settings ("org.pantheon.desktop.greeter");
+=======
+        settings = new KeyFile ();
+        try {
+            settings.load_from_file (Constants.CONF_DIR+"/pantheon-greeter.conf",
+                    KeyFileFlags.KEEP_COMMENTS);
+        } catch (Error e) {
+            warning (e.message);
+        }
+>>>>>>> MERGE-SOURCE
 
         delete_event.connect (() => {
             message ("Window got closed. Exiting...");
@@ -86,6 +96,15 @@
 
         login_gateway.login_successful.connect (() => {
             fade_out_ui ();
+<<<<<<< TREE
+=======
+
+            /* restore screensaver setting, just like lightdm-gtk-greeter.c*/
+            unowned X.Display display = (Gdk.Display.get_default () as Gdk.X11.Display).get_xdisplay ();
+            message ("restore user timeout: %d", timeout);
+            display.set_screensaver (timeout, interval, prefer_blanking,
+                allow_exposures);
+>>>>>>> MERGE-SOURCE
         });
 
         configure_event.connect (() => {

=== modified file 'src/Wallpaper.vala'
--- src/Wallpaper.vala	2014-11-08 07:40:43 +0000
+++ src/Wallpaper.vala	2015-02-06 16:12:08 +0000
@@ -54,7 +54,16 @@
     }
 
     string get_default () {
-        return new GLib.Settings ("org.pantheon.desktop.greeter").get_string ("default-wallpaper");
+        var settings = new KeyFile();
+        string default_wallpaper = "/usr/share/backgrounds/elementaryos-default";
+        try{
+            settings.load_from_file(Constants.CONF_DIR+"/pantheon-greeter.conf",
+                    KeyFileFlags.KEEP_COMMENTS);
+            default_wallpaper = settings.get_string ("greeter", "default-wallpaper");
+        } catch (Error e) {
+            warning (e.message);
+        }
+        return default_wallpaper;
     }
 
     public void reposition () {
@@ -210,4 +219,4 @@
             tex.width = (int) (w * height / h);
         }
     }
-}
\ No newline at end of file
+}