← Back to branch summary

~ubuntu-branches/ubuntu/vivid/unity-settings-daemon/vivid-proposed

« back to all changes in this revision

Viewing changes to gnome-settings-daemon/gsd-idle-monitor.c

  • Committer: Package Import Robot
  • Author(s): CI Train Bot, Ryan Tandy, Sebastien Bacher
  • Date: 2015-04-01 10:40:40 UTC
  • mfrom: (1.1.25)
  • Revision ID: package-import@ubuntu.com-20150401104040-czfaze54b61avzqg
Tags: 15.04.1+15.04.20150401-0ubuntu1
https://launchpad.net/bugs/1416081
[ Ryan Tandy ]
* gsd_idle_monitor_get_idletime() has to return a value. Use the
  correct macro for that. Fixes r4073. (LP: #1416081)

[ Sebastien Bacher ]
* let the label wrap as they should in the mount dialog

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome-settings-daemon/gsd-idle-monitor.c
656
656
{
657
657
  XSyncValue value;
658
658
 
659
 
  g_return_if_fail (GSD_IS_IDLE_MONITOR (monitor));
 
659
  g_return_val_if_fail (GSD_IS_IDLE_MONITOR (monitor), -1);
660
660
 
661
661
  if (monitor->counter == None)
662
662
    return -1;