adium 5774:8f9e74ef29ca: Mavericks is using proximity sensor for...
commits at adium.im
commits at adium.im
Wed Dec 4 16:46:13 UTC 2013
details: http://hg.adium.im/adium/rev/8f9e74ef29ca
revision: 5774:8f9e74ef29ca
branch: fix_idle
author: Christopher Loessl <cloessl at x-berg.de>
date: Mon Dec 02 00:45:02 2013 +0100
Mavericks is using proximity sensor for idle times
Mavericks is using the proximity sensor on certain computers to determine the
idle time of the user. These sensors are sometimes randomly triggered by e.g.
light.
Subject: adium 5775:8e922213bd59: Merged in hashier/adium/fix_idle (pull request #9)
details: http://hg.adium.im/adium/rev/8e922213bd59
revision: 5775:8e922213bd59
branch: adium-1.5.9
author: Thijs Alkemade <t.p.alkemade at students.uu.nl>
date: Wed Dec 04 17:43:08 2013 +0100
Merged in hashier/adium/fix_idle (pull request #9)
Mavericks is using proximity sensor for idle times
Subject: adium 5776:b8acc0b7188c: Merged pull request.
details: http://hg.adium.im/adium/rev/b8acc0b7188c
revision: 5776:b8acc0b7188c
branch: adium-1.5.10
author: Thijs Alkemade <me at thijsalkema.de>
date: Wed Dec 04 17:44:48 2013 +0100
Merged pull request.
diffs (130 lines):
diff -r 7a7aed005b2b -r b8acc0b7188c ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Thu Apr 25 14:09:50 2013 -0400
+++ b/ChangeLogs/Changes.txt Wed Dec 04 17:44:48 2013 +0100
@@ -1,12 +1,13 @@
Adium Version History
-----------------------
-Version 1.5.9 (//2013)
+Version 1.5.9 (11/23/2013)
* Fixed a crash which could occur when attempting to send files, especially on OS X 10.9. ("fain") (#16352, #16430)
* Fixed a crash which could occur on OS X 10.9.
* Fixed an issue causing Adium to hang when encoding a message.
* Fixed greyed-out user icons in the message view when using the "Stockholm" message style. (#16502)
* Fixed borderless contact lists not taking multi-screen menu bars into account. (#16514)
* Fixed building Adium on OS X 10.9. (#16408)
+ * Fixed some deprecated functions which were being logged to Console.app. (#16362)
Version 1.5.8 (10/13/2013)
diff -r 7a7aed005b2b -r b8acc0b7188c Copyright.txt
--- a/Copyright.txt Thu Apr 25 14:09:50 2013 -0400
+++ b/Copyright.txt Wed Dec 04 17:44:48 2013 +0100
@@ -72,6 +72,7 @@
Jack M.H. Lin
Paul R. Livesey
Daniel Ljungborg
+Johannes Loepelmann
Casey Lutz
Jeff Mahoney
Andreas Marienborg
diff -r 7a7aed005b2b -r b8acc0b7188c Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Thu Apr 25 14:09:50 2013 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Wed Dec 04 17:44:48 2013 +0100
@@ -67,10 +67,18 @@
- (NSImage *)imageByScalingToSize:(NSSize)size DPI:(CGFloat)dpi
{
CGFloat backingScaleFactor = dpi / 72.0;
-
- if ([[NSScreen mainScreen] respondsToSelector:@selector(backingScaleFactor)]) {
- backingScaleFactor /= [[NSScreen mainScreen] backingScaleFactor];
- }
+
+ CGFloat screenScalingFactor = 1.0;
+
+ for(NSScreen* screen in [NSScreen screens]) {
+ if ([screen respondsToSelector:@selector(backingScaleFactor)]) {
+ if([screen backingScaleFactor] > screenScalingFactor) {
+ screenScalingFactor = [screen backingScaleFactor];
+ }
+ }
+ }
+
+ backingScaleFactor /= screenScalingFactor;
return ([self imageByScalingToSize:NSMakeSize(size.width * backingScaleFactor, size.height * backingScaleFactor) fraction:1.0f flipImage:NO proportionally:YES allowAnimation:YES]);
}
diff -r 7a7aed005b2b -r b8acc0b7188c Plists/Info.plist
--- a/Plists/Info.plist Thu Apr 25 14:09:50 2013 -0400
+++ b/Plists/Info.plist Wed Dec 04 17:44:48 2013 +0100
@@ -354,7 +354,7 @@
<key>CFBundleExecutable</key>
<string>Adium</string>
<key>CFBundleGetInfoString</key>
- <string>1.5.9b3, Copyright © 2001-2013 The Adium Team</string>
+ <string>1.5.10hg, Copyright © 2001-2013 The Adium Team</string>
<key>CFBundleHelpBookFolder</key>
<string>AdiumHelp</string>
<key>CFBundleHelpBookName</key>
@@ -370,7 +370,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.5.9b3</string>
+ <string>1.5.10hg</string>
<key>CFBundleSignature</key>
<string>AdIM</string>
<key>CFBundleURLTypes</key>
@@ -469,7 +469,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.5.9b3</string>
+ <string>1.5.10hg</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.social-networking</string>
<key>LSFileQuarantineEnabled</key>
diff -r 7a7aed005b2b -r b8acc0b7188c Release/Makefile
--- a/Release/Makefile Thu Apr 25 14:09:50 2013 -0400
+++ b/Release/Makefile Wed Dec 04 17:44:48 2013 +0100
@@ -17,7 +17,7 @@
# - make all
###########
-VERSION=1.5.9b3
+VERSION=1.5.10hg
BUILD_IN_DEBUG_MODE?=TRUE
BETA?=TRUE
OFFICIAL_BUILD?=TRUE
diff -r 7a7aed005b2b -r b8acc0b7188c Source/AdiumIdleManager.m
--- a/Source/AdiumIdleManager.m Thu Apr 25 14:09:50 2013 -0400
+++ 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
More information about the commits
mailing list