Merge lp:~donadigo/pantheon-greeter/fix-1593982-background-not-set into lp:~elementary-pantheon/pantheon-greeter/trunk

Proposed by Adam Bieńkowski
Status: Merged
Approved by: Danielle Foré
Approved revision: 462
Merged at revision: 462
Proposed branch: lp:~donadigo/pantheon-greeter/fix-1593982-background-not-set
Merge into: lp:~elementary-pantheon/pantheon-greeter/trunk
Diff against target: 27 lines (+5/-5)
1 file modified
src/PantheonGreeter.vala (+5/-5)
To merge this branch: bzr merge lp:~donadigo/pantheon-greeter/fix-1593982-background-not-set
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+297831@code.launchpad.net

Commit message

moved the wallpaper change connection BEFORE the actual first set of wallpaper

Description of the change

Fixes bug #1593982: "Greeter calls wallpaper twice time at the same login screeen".

This bug was introduced by r459, which was organizing the code but accidentaly moved the wallpaper change connection AFTER the actual first set of wallpaper which caused to having the default wallpaper displayed instead of the correct one.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/PantheonGreeter.vala'
2--- src/PantheonGreeter.vala 2016-06-14 21:41:53 +0000
3+++ src/PantheonGreeter.vala 2016-06-18 16:01:08 +0000
4@@ -179,6 +179,11 @@
5 display.force_screensaver (Screensaver.ACTIVE);
6 }
7
8+ message ("Finished building UI...");
9+ this.get_window ().focus (Gdk.CURRENT_TIME);
10+
11+ connect_signals ();
12+
13 var select_user = login_gateway.select_user;
14 var switch_to_user = (select_user != null) ? select_user : get_greeter_state ("last-user");
15
16@@ -194,11 +199,6 @@
17 if (userlist.current_user == null) {
18 userlist.current_user = userlist.get_user (0);
19 }
20-
21- message ("Finished building UI...");
22- this.get_window ().focus (Gdk.CURRENT_TIME);
23-
24- connect_signals ();
25 }
26
27 void connect_signals () {

Subscribers

People subscribed via source and target branches