adium/adium

Merged pull request.
adium-1.5.10
2013-12-04, Thijs Alkemade
b8acc0b7188c
Parents a0b7e42505628e922213bd59
Children 78db6a0ed1c7
Merged pull request.
1 files changed, 16 insertions(+), 3 deletions(-)
  • +16 -3
    Source/AdiumIdleManager.m
    • --- a/Source/AdiumIdleManager.m Wed Dec 04 17:17:21 2013 +0100
    +++ b/Source/AdiumIdleManager.m Wed Dec 04 17:44:48 2013 +0100
    @@ -68,13 +68,26 @@
    */
    - (CFTimeInterval)currentMachineIdle
    {
    - return CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateCombinedSessionState, kCGAnyInputEventType);
    + CFTimeInterval smallestIdleTime;
    + CFTimeInterval tmp;
    +
    + smallestIdleTime = CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateCombinedSessionState, kCGEventKeyDown);
    + tmp = CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateCombinedSessionState, kCGEventMouseMoved);
    + if (tmp < smallestIdleTime) {
    + smallestIdleTime = tmp;
    + }
    + tmp = CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateCombinedSessionState, kCGEventFlagsChanged);
    + if (tmp < smallestIdleTime) {
    + smallestIdleTime = tmp;
    + }
    +
    + return smallestIdleTime;
    }
    /*!
    - * @brief Timer that checkes for machine idle
    + * @brief Timer that checks for machine idle
    *
    - * This timer periodically checks the machine for inactivity. When the machine has been inactive for atleast
    + * This timer periodically checks the machine for inactivity. When the machine has been inactive for at least
    * MACHINE_IDLE_THRESHOLD seconds, a notification is broadcast.
    *
    * When the machine is active, this timer is called infrequently. It's not important to notice that the user went