Ubuntu
xfce4-power-manager package

Merge lp://staging/~bluesabre/ubuntu/trusty/xfce4-power-manager/sync_lock_xfpm_session into lp://staging/ubuntu/trusty/xfce4-power-manager

  1. Trusty (14.04)
  2. sync_lock_xfpm_session
  3. Merge into trusty
Proposed by Sean Davis
Status: Merged
Merged at revision: 38
Proposed branch: lp://staging/~bluesabre/ubuntu/trusty/xfce4-power-manager/sync_lock_xfpm_session
Merge into: lp://staging/ubuntu/trusty/xfce4-power-manager
Diff against target: 2629 lines (+2527/-3)
8 files modified
.pc/09_sync_session_xfpm_lock_setting.patch/settings/xfpm-settings.c (+1726/-0)
.pc/09_sync_session_xfpm_lock_setting.patch/src/xfpm-xfconf.c (+610/-0)
.pc/applied-patches (+1/-0)
debian/changelog (+6/-0)
debian/patches/09_sync_session_xfpm_lock_setting.patch (+126/-0)
debian/patches/series (+1/-0)
settings/xfpm-settings.c (+7/-1)
src/xfpm-xfconf.c (+50/-2)
To merge this branch: bzr merge lp://staging/~bluesabre/ubuntu/trusty/xfce4-power-manager/sync_lock_xfpm_session
Reviewer Review Type Date Requested Status
Chris J Arges Needs Fixing
Pasi Lallinaho (community) community Approve
Review via email: mp+214392@code.staging.launchpad.net

Description of the change

Adds the patch 09_sync_session_xfpm_lock_setting.patch

Description: Sync the lock settings from xfce4-session and xfce4-power-manager
 xfce4-session and xfce4-power-manager both have options to lock the screen
 on suspend. However, these options are not synced and can lead to some
 confusion for the user. This patch syncs these settings from the power
 manager.

Origin: other, https://github.com/EricKoegel/xfce4-power-manager/tree/be-friendly
Bug: https://bugzilla.xfce.org/show_bug.cgi?id=9030
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xfce4-power-manager/+bug/1101982

To post a comment you must log in.
Revision history for this message
Sean Davis (bluesabre) wrote :

This has been uploaded to the following PPA and tested.

https://launchpad.net/~smd-seandavis/+archive/testing

Please include this patch prior to the trusty final freeze.

Revision history for this message
Pasi Lallinaho (knome) wrote :

Approve with my Xubuntu Project lead hat on.

review: Approve (community)
Revision history for this message
Chris J Arges (arges) wrote :

So this merge had some extra files added in .pc. I fixed this and sponsored it with just the additional patch in debian/patches, the updated series file and the updated changelog.

review: Needs Fixing

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: