Merge lp:ubuntu-push/automatic into lp:ubuntu-push

Proposed by Jonas G. Drange
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 420
Merged at revision: 153
Proposed branch: lp:ubuntu-push/automatic
Merge into: lp:ubuntu-push
Diff against target: 17 lines (+0/-7)
1 file modified
client/service/postal.go (+0/-7)
To merge this branch: bzr merge lp:ubuntu-push/automatic
Reviewer Review Type Date Requested Status
Ubuntu Push Hackers Pending
Review via email: mp+279356@code.launchpad.net

Commit message

present a notification even though the screen is locked

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 'client/service/postal.go'
2--- client/service/postal.go 2015-10-29 15:36:41 +0000
3+++ client/service/postal.go 2015-12-02 20:53:05 +0000
4@@ -431,13 +431,6 @@
5 locked := svc.unityGreeter.IsActive()
6 focused := svc.windowStack.IsAppFocused(app)
7
8- if output.Notification.Card != nil && output.Notification.Card.Popup {
9- if locked {
10- // Screen is locked, ensure popup is false
11- output.Notification.Card.Popup = false
12- }
13- }
14-
15 if !locked && focused {
16 svc.Log.Debugf("notification skipped because app is focused.")
17 return false

Subscribers

People subscribed via source and target branches