Merge lp://qastaging/~darkxst/unity-settings-daemon/lp1377847 into lp://qastaging/unity-settings-daemon
Proposed by
Tim Lunn
Status: | Rejected |
---|---|
Rejected by: | Sebastien Bacher |
Proposed branch: | lp://qastaging/~darkxst/unity-settings-daemon/lp1377847 |
Merge into: | lp://qastaging/unity-settings-daemon |
Diff against target: |
1734 lines (+931/-494) 9 files modified
debian/libunity-settings-daemon1.symbols (+4/-2) gnome-settings-daemon/Makefile.am (+19/-2) gnome-settings-daemon/gsd-idle-monitor-private.h (+29/-0) gnome-settings-daemon/gsd-idle-monitor.c (+774/-413) gnome-settings-daemon/gsd-idle-monitor.h (+54/-74) gnome-settings-daemon/idle-monitor.xml (+35/-0) gnome-settings-daemon/main.c (+7/-0) plugins/cursor/gsd-cursor-manager.c (+8/-2) plugins/power/gsd-power-manager.c (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~darkxst/unity-settings-daemon/lp1377847 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Needs Fixing | ||
Iain Lane | Needs Fixing | ||
Review via email: mp+237507@code.qastaging.launchpad.net |
Commit message
Copy in Idle Monitor from 3.10 and hook up dbus interface
To post a comment you must log in.
Thanks, small nitpick in the inline comments.
Are you sure nothing is using the removed symbols? I know they've only been there for a short time.