Ubuntu
gnome-power-manager package

Merge lp://qastaging/~psusi/ubuntu/natty/gnome-power-manager/sleep into lp://qastaging/ubuntu/natty/gnome-power-manager

  1. Natty (11.04)
  2. sleep
  3. Merge into natty
Proposed by Phillip Susi
Status: Rejected
Rejected by: James Westby
Proposed branch: lp://qastaging/~psusi/ubuntu/natty/gnome-power-manager/sleep
Merge into: lp://qastaging/ubuntu/natty/gnome-power-manager
Diff against target: 985 lines (+761/-89)
7 files modified
.pc/applied-patches (+2/-0)
.pc/lock-screen-on-signal.patch/src/gpm-control.c (+347/-0)
debian/changelog (+9/-0)
debian/control (+1/-1)
debian/patches/lock-screen-on-signal.patch (+291/-0)
debian/patches/series (+1/-0)
src/gpm-control.c (+110/-88)
To merge this branch: bzr merge lp://qastaging/~psusi/ubuntu/natty/gnome-power-manager/sleep
Reviewer Review Type Date Requested Status
Chris Coulson (community) Disapprove
Phillip Susi (community) Needs Resubmitting
Chris Halse Rogers Needs Fixing
Ubuntu branches Pending
Review via email: mp+54095@code.qastaging.launchpad.net

Description of the change

See linked bug report and related branches that all need merged together.

To post a comment you must log in.
Revision history for this message
Chris Halse Rogers (raof) wrote :

gpm_control_resume seems to be almost entirely dead code - you've got a lot of ifs that lead to reading gconf keys, but never actually use them?

Apart from that, looks good to me.

review: Needs Fixing
lp://qastaging/~psusi/ubuntu/natty/gnome-power-manager/sleep updated
188. By Phillip Susi

Add lock-screen-on-signal.patch: refactor gpm suspend and hibernate
methods to lock the screen in response to the signal from upower
indicating that the system is suspending or hibernating, instead of
as part of its decision to suspend or hibernate. (LP: #578542)

Revision history for this message
Phillip Susi (psusi) wrote :

Oops, good point. I forgot a hunk of code when migrating it from the old suspend control method to the resuming signal handler. I also forgot to remove the duplicate code from the hibernate control method that is now in the signal handlers. Took care of that.

review: Needs Resubmitting
Revision history for this message
Chris Coulson (chrisccoulson) wrote :

Note that this depends on the upower merge (see my comment there)

review: Disapprove

Unmerged revisions

188. By Phillip Susi

Add lock-screen-on-signal.patch: refactor gpm suspend and hibernate
methods to lock the screen in response to the signal from upower
indicating that the system is suspending or hibernating, instead of
as part of its decision to suspend or hibernate. (LP: #578542)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: