Unity Settings Daemon

Merge lp:~rtandy/unity-settings-daemon/lp1416081 into lp:unity-settings-daemon

  1. lp1416081
  2. Merge into trunk
Proposed by Ryan Tandy
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 4079
Merged at revision: 4079
Proposed branch: lp:~rtandy/unity-settings-daemon/lp1416081
Merge into: lp:unity-settings-daemon
Diff against target: 12 lines (+1/-1)
1 file modified
gnome-settings-daemon/gsd-idle-monitor.c (+1/-1)
To merge this branch: bzr merge lp:~rtandy/unity-settings-daemon/lp1416081
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+254808@code.launchpad.net

Commit message

gsd_idle_monitor_get_idletime() has to return a value. Use the correct macro for that. Fixes r4073.

Description of the change

My previous MP obviously used the wrong macro. No functional effect as u-s-d itself never calls that function with NULL, but still wrong. Sorry for adding more noise.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gnome-settings-daemon/gsd-idle-monitor.c'
2--- gnome-settings-daemon/gsd-idle-monitor.c 2015-02-03 23:35:59 +0000
3+++ gnome-settings-daemon/gsd-idle-monitor.c 2015-03-31 17:52:42 +0000
4@@ -656,7 +656,7 @@
5 {
6 XSyncValue value;
7
8- g_return_if_fail (GSD_IS_IDLE_MONITOR (monitor));
9+ g_return_val_if_fail (GSD_IS_IDLE_MONITOR (monitor), -1);
10
11 if (monitor->counter == None)
12 return -1;

Subscribers

People subscribed via source and target branches