adium 5752:733544ee342e: Merge diverging heads of the 1.5.9 branch
commits at adium.im
commits at adium.im
Thu Oct 31 11:25:22 UTC 2013
details: http://hg.adium.im/adium/rev/733544ee342e
revision: 5752:733544ee342e
branch: adium-1.5.9
author: Robert Vehse <robertvehse at fastmail.fm>
date: Thu Oct 31 12:22:21 2013 +0100
Merge diverging heads of the 1.5.9 branch
diffs (725 lines):
diff -r 5fca6586773b -r 733544ee342e AdiumHelp/pgs/Accounts-Gizmo5.html
--- a/AdiumHelp/pgs/Accounts-Gizmo5.html Wed Oct 30 23:45:47 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta name="keywords" content="Gizmo5, Gizmo" />
-<meta name="description" content="Gizmo5" />
-<title>Gizmo5</title>
-<link href="../css/topicpage.css" type="text/css" rel="stylesheet" media="all" />
-</head>
-<body>
-<div id="banner">
- <div id="navleft"><a class="navleftsty" href="../AdiumHelp.html">Adium Help</a> <a class="navleftsty" href="AdiumDocumentation.html">Adium Documentation</a></div>
-</div>
-<div id="mainbox">
- <div id="caticon"> <img src="../gfx/AdiumIcon.png" alt="Adium Icon" height="32" width="32" border="0" /> </div>
- <div id="pagetitle">
- <h1>Gizmo5</h1>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Description</h3>
- </div>
- <div class="taskboxtext">
- <table>
- <tr>
- <td><strong>Homepage:</strong></td>
- <td> <a class="ext_link" href="http://gizmo5.com/">http://gizmo5.com/</a></td>
- </tr>
- <tr>
- <td><strong>Type:</strong></td>
- <td>XMPP-based, proprietary</td>
- </tr>
- <tr>
- <td><strong>Identity:</strong></td>
- <td>Jabber ID (JID), e.g. username at chat.gizmoproject.com</td>
- </tr>
- <tr>
- <td><strong>Interoperability:</strong></td>
- <td>XMPP, LiveJournal, Google Talk</td>
- </tr>
- </table>
- <p>Apart from using and being compatible with XMPP, Gizmo5 also has proprietary elements.</p>
- <p>Gizmo's chat system is simply XMPP, so all you need to do is add the account as a Jabber account. For example, if your Gizmo Project username is "jdoe", your Jabber ID is "jdoe at chat.gizmoproject.com".</p>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>History</h3>
- </div>
- <div class="taskboxtext">
- <p></p>
- </div>
- </div>
- <div class="taskboxline">
- <div class="taskboxheader">
- <h3>Censorship</h3>
- </div>
- <div class="taskboxtext">
- <p></p>
- </div>
- </div>
-</div>
-<script type="text/javascript" src="../js/help.js"></script>
-</body>
-</html>
diff -r 5fca6586773b -r 733544ee342e AdiumHelp/pgs/Accounts-ListOfServices.html
--- a/AdiumHelp/pgs/Accounts-ListOfServices.html Wed Oct 30 23:45:47 2013 -0400
+++ b/AdiumHelp/pgs/Accounts-ListOfServices.html Thu Oct 31 12:22:21 2013 +0100
@@ -31,7 +31,6 @@
<li><a href="Accounts-GoogleTalk.html">Google Talk</a></li>
<li><a href="Accounts-LJTalk.html">LJ (LiveJournal) Talk</a></li>
<li><a href="Accounts-FacebookChat.html">Facebook Chat</a></li>
- <li><a href="Accounts-Gizmo5.html">Gizmo5</a></li>
</ul>
<li><a href="Accounts-MSN.html">MSN Messenger</a></li>
<li><a href="Accounts-AIM.html">AOL Instant Messenger (AIM)</a>, including</li>
diff -r 5fca6586773b -r 733544ee342e AdiumHelp/pgs/AdiumDocumentation.html
--- a/AdiumHelp/pgs/AdiumDocumentation.html Wed Oct 30 23:45:47 2013 -0400
+++ b/AdiumHelp/pgs/AdiumDocumentation.html Thu Oct 31 12:22:21 2013 +0100
@@ -190,7 +190,6 @@
<li><a href="Accounts-GoogleTalk.html">Google Talk</a></li>
<li><a href="Accounts-LJTalk.html">LJ (LiveJournal) Talk</a></li>
<li><a href="Accounts-FacebookChat.html">Facebook Chat</a></li>
- <li><a href="Accounts-Gizmo5.html">Gizmo5</a></li>
</ul>
<li><a href="Accounts-MSN.html">MSN Messenger</a></li>
<li><a href="Accounts-AIM.html">AOL Instant Messenger (AIM)</a>, including</li>
diff -r 5fca6586773b -r 733544ee342e AdiumHelp/pgs/Troubleshooting-RecoveringLostPasswords.html
--- a/AdiumHelp/pgs/Troubleshooting-RecoveringLostPasswords.html Wed Oct 30 23:45:47 2013 -0400
+++ b/AdiumHelp/pgs/Troubleshooting-RecoveringLostPasswords.html Thu Oct 31 12:22:21 2013 +0100
@@ -51,7 +51,7 @@
<p>If you can't find any IM-service passwords in the Keychain, or none of them work, you'll have to have the IM service change your password.</p>
<p>Most services, if not all, don't keep a clear-text copy of your password to send you because if they lost that database (by accident or by theft), people's accounts could be compromised. They keep only an encrypted version of the password, which is more secure, but inconvenient because it leaves changing it as your only option.</p>
<p><i>Again, note that Adium is a third-party client; we don't run any of the instant-messaging services that Adium supports. If you want your password sent to you or changed, you'll need to contact the IM service that you're using.</i></p>
- <p>We maintain a list of contact information for various services on the <a href="Accounts-CreatingAccounts.html">Creating accounts</a> page. We're not recommending that you throw away your old account and create a new one—it just happens to be the same contact information.</p>
+ <p>We maintain a list of contact information for various services on the <a href="Accounts-CreatingAccounts.html#signing_up_for_an_account">Creating accounts</a> page. We're not recommending that you throw away your old account and create a new one—it just happens to be the same contact information.</p>
<p>Once you have your password up and running, we recommend that you turn on the “Remember Password” option in Adium. This saves your password in the Mac OS X Keychain, so that you won't have to enter it every time you launch Adium. The Keychain encrypts the password, so it is secure, and it allows you to look it up if you ever need it again.
</p>
</div>
diff -r 5fca6586773b -r 733544ee342e ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt Wed Oct 30 23:45:47 2013 -0400
+++ b/ChangeLogs/Changes.txt Thu Oct 31 12:22:21 2013 +0100
@@ -1,5 +1,13 @@
Adium Version History
-----------------------
+Version 1.5.9 (//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 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)
+
+
Version 1.5.8 (10/13/2013)
* Changed the default tab switching shortcuts for new users to Control-Tab/Control-Shift-Tab, to match Safari. This was meant to be done for 1.5.4 but it did not work that time. (#16102)
* Security: Enabled a large number of TLS cipher suites, including ECC suites and suites new in TLS 1.2.
diff -r 5fca6586773b -r 733544ee342e Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.h
--- a/Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.h Wed Oct 30 23:45:47 2013 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.h Thu Oct 31 12:22:21 2013 +0100
@@ -19,5 +19,6 @@
- (NSString *)applicationVersion;
- (BOOL)isOnLionOrNewer;
+- (BOOL)isOnMavericksOrNewer;
@end
diff -r 5fca6586773b -r 733544ee342e Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.m Wed Oct 30 23:45:47 2013 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIApplicationAdditions.m Thu Oct 31 12:22:21 2013 +0100
@@ -20,6 +20,9 @@
#ifndef NSAppKitVersionNumber10_6
#define NSAppKitVersionNumber10_6 1038
#endif
+#ifndef NSAppKitVersionNumber10_8
+#define NSAppKitVersionNumber10_8 1187
+#endif
@implementation NSApplication (AIApplicationAdditions)
@@ -34,4 +37,9 @@
return (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6);
}
+- (BOOL)isOnMavericksOrNewer
+{
+ return (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_8);
+}
+
@end
diff -r 5fca6586773b -r 733544ee342e Frameworks/AIUtilities Framework/Source/AIImageAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageAdditions.m Wed Oct 30 23:45:47 2013 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIImageAdditions.m Thu Oct 31 12:22:21 2013 +0100
@@ -139,7 +139,7 @@
NSRectFill(NSMakeRect(0, 0, size.width, size.height));
// Draw the image
- [self compositeToPoint:NSZeroPoint operation:NSCompositeSourceOver];
+ [self drawAtPoint:NSZeroPoint fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
// We're done drawing
[tempImage unlockFocus];
diff -r 5fca6586773b -r 733544ee342e Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m
--- a/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Wed Oct 30 23:45:47 2013 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Thu Oct 31 12:22:21 2013 +0100
@@ -51,7 +51,7 @@
}
// Draw and shift
- [self compositeToPoint:destRect.origin fromRect:sourceRect operation:NSCompositeSourceOver];
+ [self drawAtPoint:destRect.origin fromRect:sourceRect operation:NSCompositeSourceOver fraction:1.0];
destRect.origin.x += destRect.size.width;
}
diff -r 5fca6586773b -r 733544ee342e Frameworks/AIUtilities Framework/Source/AIOSCompatibility.h
--- a/Frameworks/AIUtilities Framework/Source/AIOSCompatibility.h Wed Oct 30 23:45:47 2013 -0400
+++ b/Frameworks/AIUtilities Framework/Source/AIOSCompatibility.h Thu Oct 31 12:22:21 2013 +0100
@@ -14,17 +14,30 @@
* write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-// XXX - Remove this on 10.7+ transition
-
-#ifndef AILeopardCompatibility
-#define AILeopardCompatibility
+#ifndef AICompatibility
+#define AICompatibility
#import <AvailabilityMacros.h>
+#ifndef MAC_OS_X_VERSION_10_9
+#define MAC_OS_X_VERSION_10_9 1090
+#endif //ndef MAC_OS_X_VERSION_10_9
+
#ifndef MAC_OS_X_VERSION_10_7
#define MAC_OS_X_VERSION_10_7 1070
#endif //ndef MAC_OS_X_VERSION_10_7
+#if MAC_OS_X_VERSION_10_9 > MAC_OS_X_VERSION_MAX_ALLOWED
+
+#ifdef __OBJC__
+
+ at interface NSScreen (NewMavericksMethods)
++ (BOOL)screensHaveSeparateSpaces;
+ at end
+
+#endif
+#endif //MAC_OS_X_VERSION_10_9
+
#if MAC_OS_X_VERSION_10_7 > MAC_OS_X_VERSION_MAX_ALLOWED
#ifdef __OBJC__
@@ -43,9 +56,6 @@
@end
#endif
-
-#else //Not compiling for 10.7
-
#endif //MAC_OS_X_VERSION_10_7
#endif
diff -r 5fca6586773b -r 733544ee342e Frameworks/Adium Framework/Source/ESFileTransfer.m
--- a/Frameworks/Adium Framework/Source/ESFileTransfer.m Wed Oct 30 23:45:47 2013 -0400
+++ b/Frameworks/Adium Framework/Source/ESFileTransfer.m Thu Oct 31 12:22:21 2013 +0100
@@ -378,7 +378,7 @@
[iconImage lockFocus];
- [systemIcon compositeToPoint:NSZeroPoint operation:NSCompositeSourceOver];
+ [systemIcon drawAtPoint:NSZeroPoint fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
CGFloat line = ((NSWidth(bottomRight) / 15) + ((NSHeight(bottomRight) / 15) / 2));
NSRect circleRect = NSMakeRect(NSMinX(bottomRight),
diff -r 5fca6586773b -r 733544ee342e Frameworks/Growl.framework/Versions/A/Growl
Binary file Frameworks/Growl.framework/Versions/A/Growl has changed
diff -r 5fca6586773b -r 733544ee342e Frameworks/Growl.framework/Versions/A/Headers/GrowlPluginPreferenceStrings.h
--- a/Frameworks/Growl.framework/Versions/A/Headers/GrowlPluginPreferenceStrings.h Wed Oct 30 23:45:47 2013 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-//
-// GrowlPluginPreferenceStrings.h
-// Growl
-//
-// Created by Daniel Siemer on 1/30/12.
-// Copyright (c) 2012 The Growl Project. All rights reserved.
-//
-
-/* FOR GROWL DEVELOPED COCOA PLUGINS ONLY AT THIS TIME, NOT STABLE */
-
-#import <Foundation/Foundation.h>
-
-#define GrowlDisplayOpacity NSLocalizedStringFromTable(@"Opacity:", @"PluginPrefStrings", @"How clear the display is")
-#define GrowlDisplayDuration NSLocalizedStringFromTable(@"Duration:", @"PluginPrefStrings", @"How long a notification will stay on screen")
-
-#define GrowlDisplayPriority NSLocalizedStringFromTable(@"Priority: (low to high)", @"PluginPrefStrings", @"Label for columns of color wells for various priority levels")
-#define GrowlDisplayPriorityLow NSLocalizedStringFromTable(@"Very Low", @"PluginPrefStrings", @"Notification Priority Very Low")
-#define GrowlDisplayPriorityModerate NSLocalizedStringFromTable(@"Moderate", @"PluginPrefStrings", @"Notification Priority Moderate")
-#define GrowlDisplayPriorityNormal NSLocalizedStringFromTable(@"Normal", @"PluginPrefStrings", @"Notification Priority Normal")
-#define GrowlDisplayPriorityHigh NSLocalizedStringFromTable(@"High", @"PluginPrefStrings", @"Notification Priority High")
-#define GrowlDisplayPriorityEmergency NSLocalizedStringFromTable(@"Emergency", @"PluginPrefStrings", @"Notification Priority Emergency")
-
-#define GrowlDisplayTextColor NSLocalizedStringFromTable(@"Text", @"PluginPrefStrings", @"Label for row of color wells for the text element of the plugin")
-#define GrowlDisplayBackgroundColor NSLocalizedStringFromTable(@"Background", @"PluginPrefStrings", @"Label for row of color wells for the background of the plugin")
-
-#define GrowlDisplayLimitLines NSLocalizedStringFromTable(@"Limit to 2-5 lines", @"PluginPrefStrings", @"Checkbox to limit the display to 2-5 lines")
-#define GrowlDisplayScreen NSLocalizedStringFromTable(@"Screen:", @"PluginPrefStrings", @"Label for box to select screen for display to use")
-#define GrowlDisplaySize NSLocalizedStringFromTable(@"Size:", @"PluginPrefStrings", @"Label for pop up box for selecting the size of the display")
-#define GrowlDisplaySizeNormal NSLocalizedStringFromTable(@"Normal", @"PluginPrefStrings", @"Normal size for the display")
-#define GrowlDisplaySizeLarge NSLocalizedStringFromTable(@"Large", @"PluginPrefStrings", @"Large size for the display")
-#define GrowlDisplaySizeSmall NSLocalizedStringFromTable(@"Small", @"PluginPrefStrings", @"Small size for the display")
-
-#define GrowlDisplayFloatingIcon NSLocalizedStringFromTable(@"Floating Icon", @"PluginPrefStrings", @"Label for checkbox that says to do a floating icon")
-
-#define GrowlDisplayEffect NSLocalizedStringFromTable(@"Effect:", @"PluginPrefStrings", @"Label for the effect to use")
-#define GrowlDisplayEffectSlide NSLocalizedStringFromTable(@"Slide", @"PluginPrefStrings", @"A slide effect")
-#define GrowlDisplayEffectFade NSLocalizedStringFromTable(@"Fade", @"PluginPrefStrings", @"A fade effect")
-
- at interface GrowlPluginPreferenceStrings : NSObject
-
- at property (nonatomic, retain) NSString *growlDisplayOpacity;
- at property (nonatomic, retain) NSString *growlDisplayDuration;
-
- at property (nonatomic, retain) NSString *growlDisplayPriority;
- at property (nonatomic, retain) NSString *growlDisplayPriorityVeryLow;
- at property (nonatomic, retain) NSString *growlDisplayPriorityModerate;
- at property (nonatomic, retain) NSString *growlDisplayPriorityNormal;
- at property (nonatomic, retain) NSString *growlDisplayPriorityHigh;
- at property (nonatomic, retain) NSString *growlDisplayPriorityEmergency;
-
- at property (nonatomic, retain) NSString *growlDisplayTextColor;
- at property (nonatomic, retain) NSString *growlDisplayBackgroundColor;
-
- at property (nonatomic, retain) NSString *growlDisplayLimitLines;
- at property (nonatomic, retain) NSString *growlDisplayScreen;
- at property (nonatomic, retain) NSString *growlDisplaySize;
- at property (nonatomic, retain) NSString *growlDisplaySizeNormal;
- at property (nonatomic, retain) NSString *growlDisplaySizeLarge;
- at property (nonatomic, retain) NSString *growlDisplaySizeSmall;
-
- at property (nonatomic, retain) NSString *growlDisplayFloatingIcon;
-
- at property (nonatomic, retain) NSString *effectLabel;
- at property (nonatomic, retain) NSString *slideEffect;
- at property (nonatomic, retain) NSString *fadeEffect;
-
- at end
diff -r 5fca6586773b -r 733544ee342e Frameworks/Growl.framework/Versions/A/Resources/Info.plist
--- a/Frameworks/Growl.framework/Versions/A/Resources/Info.plist Wed Oct 30 23:45:47 2013 -0400
+++ b/Frameworks/Growl.framework/Versions/A/Resources/Info.plist Thu Oct 31 12:22:21 2013 +0100
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
- <string>12A269</string>
+ <string>12C60</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
@@ -15,25 +15,25 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
- <string>2.0</string>
+ <string>2.0.1</string>
<key>CFBundleSignature</key>
<string>GRRR</string>
<key>CFBundleVersion</key>
- <string>2.0</string>
+ <string>2.0.1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
- <string>4F250</string>
+ <string>4G2008a</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
- <string>12A264</string>
+ <string>12C37</string>
<key>DTSDKName</key>
<string>macosx10.8</string>
<key>DTXcode</key>
- <string>0440</string>
+ <string>0452</string>
<key>DTXcodeBuild</key>
- <string>4F250</string>
+ <string>4G2008a</string>
<key>NSPrincipalClass</key>
<string>GrowlApplicationBridge</string>
</dict>
diff -r 5fca6586773b -r 733544ee342e Frameworks/Growl.framework/Versions/A/_CodeSignature/CodeResources
--- a/Frameworks/Growl.framework/Versions/A/_CodeSignature/CodeResources Wed Oct 30 23:45:47 2013 -0400
+++ b/Frameworks/Growl.framework/Versions/A/_CodeSignature/CodeResources Thu Oct 31 12:22:21 2013 +0100
@@ -6,7 +6,7 @@
<dict>
<key>Resources/Info.plist</key>
<data>
- lnx8exuPwE/bsUq32R5DXDQholc=
+ VZb3f8My4te/5JwcjfvotgCXTAs=
</data>
</dict>
<key>rules</key>
diff -r 5fca6586773b -r 733544ee342e Plists/Info.plist
--- a/Plists/Info.plist Wed Oct 30 23:45:47 2013 -0400
+++ b/Plists/Info.plist Thu Oct 31 12:22:21 2013 +0100
@@ -354,7 +354,7 @@
<key>CFBundleExecutable</key>
<string>Adium</string>
<key>CFBundleGetInfoString</key>
- <string>1.5.9hg, Copyright © 2001-2013 The Adium Team</string>
+ <string>1.5.9b1, 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.9hg</string>
+ <string>1.5.9b1</string>
<key>CFBundleSignature</key>
<string>AdIM</string>
<key>CFBundleURLTypes</key>
@@ -469,7 +469,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.5.9hg</string>
+ <string>1.5.9b1</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.social-networking</string>
<key>LSFileQuarantineEnabled</key>
diff -r 5fca6586773b -r 733544ee342e Plugins/Dual Window Interface/AIMessageWindowController.m
--- a/Plugins/Dual Window Interface/AIMessageWindowController.m Wed Oct 30 23:45:47 2013 -0400
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m Thu Oct 31 12:22:21 2013 +0100
@@ -1015,7 +1015,7 @@
NSPoint tabOrigin = [tabView frame].origin;
tabOrigin.x += 10;
tabOrigin.y += 13;
- [tabViewImage compositeToPoint:tabOrigin operation:NSCompositeSourceOver];
+ [tabViewImage drawAtPoint:tabOrigin fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
[viewImage unlockFocus];
//draw over where the tab bar would usually be
diff -r 5fca6586773b -r 733544ee342e Plugins/Purple Service/AIFacebookXMPPAccountViewController.m
--- a/Plugins/Purple Service/AIFacebookXMPPAccountViewController.m Wed Oct 30 23:45:47 2013 -0400
+++ b/Plugins/Purple Service/AIFacebookXMPPAccountViewController.m Thu Oct 31 12:22:21 2013 +0100
@@ -116,7 +116,7 @@
/* xxx it'd be better to link to an entry in our docs */
- (IBAction)showHelp:(id)sender
{
- [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://trac.adium.im/wiki/FacebookChat"]];
+ [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://adium.im/help/pgs/Accounts-FacebookChat.html"]];
}
@end
diff -r 5fca6586773b -r 733544ee342e Plugins/Purple Service/AIFacebookXMPPOauthWebViewWindow.xib
--- a/Plugins/Purple Service/AIFacebookXMPPOauthWebViewWindow.xib Wed Oct 30 23:45:47 2013 -0400
+++ b/Plugins/Purple Service/AIFacebookXMPPOauthWebViewWindow.xib Thu Oct 31 12:22:21 2013 +0100
@@ -2,19 +2,19 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">11C74</string>
- <string key="IBDocument.InterfaceBuilderVersion">1938</string>
- <string key="IBDocument.AppKitVersion">1138.23</string>
- <string key="IBDocument.HIToolboxVersion">567.00</string>
+ <string key="IBDocument.SystemVersion">13A603</string>
+ <string key="IBDocument.InterfaceBuilderVersion">4514</string>
+ <string key="IBDocument.AppKitVersion">1265</string>
+ <string key="IBDocument.HIToolboxVersion">695.00</string>
<dictionary class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="com.apple.InterfaceBuilder.CocoaPlugin">1938</string>
- <string key="com.apple.WebKitIBPlugin">822</string>
+ <string key="com.apple.InterfaceBuilder.CocoaPlugin">4514</string>
+ <string key="com.apple.WebKitIBPlugin">3336</string>
</dictionary>
<array key="IBDocument.IntegratedClassDependencies">
+ <string>NSCustomObject</string>
+ <string>NSProgressIndicator</string>
+ <string>NSView</string>
<string>NSWindowTemplate</string>
- <string>NSView</string>
- <string>NSProgressIndicator</string>
- <string>NSCustomObject</string>
<string>WebView</string>
</array>
<array key="IBDocument.PluginDependencies">
@@ -44,6 +44,7 @@
<string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/>
<nil key="NSUserInterfaceItemIdentifier"/>
+ <string key="NSWindowContentMaxSize">{640, 380}</string>
<object class="NSView" key="NSWindowView" id="1006">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
@@ -89,10 +90,10 @@
<object class="NSProgressIndicator" id="873347688">
<reference key="NSNextResponder" ref="1006"/>
<int key="NSvFlags">1292</int>
- <object class="NSPSMatrix" key="NSDrawMatrix"/>
<string key="NSFrame">{{304, 174}, {32, 32}}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<int key="NSpiFlags">28682</int>
<double key="NSMaxValue">100</double>
</object>
@@ -103,12 +104,13 @@
<reference key="NSNextKeyView" ref="950810926"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
- <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+ <string key="NSMaxSize">{640, 402}</string>
<string key="NSFrameAutosaveName">FBXMPPOAUTH</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
+ <bool key="usesAutoincrementingIDs">NO</bool>
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -116,7 +118,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="950810926"/>
</object>
- <int key="connectionID">4</int>
+ <string key="id">4</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -124,7 +126,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="1005"/>
</object>
- <int key="connectionID">6</int>
+ <string key="id">6</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -132,7 +134,7 @@
<reference key="source" ref="1001"/>
<reference key="destination" ref="873347688"/>
</object>
- <int key="connectionID">8</int>
+ <string key="id">8</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -140,7 +142,7 @@
<reference key="source" ref="1005"/>
<reference key="destination" ref="1001"/>
</object>
- <int key="connectionID">10</int>
+ <string key="id">10</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -148,7 +150,7 @@
<reference key="source" ref="950810926"/>
<reference key="destination" ref="1001"/>
</object>
- <int key="connectionID">5</int>
+ <string key="id">5</string>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -156,37 +158,37 @@
<reference key="source" ref="950810926"/>
<reference key="destination" ref="1001"/>
</object>
- <int key="connectionID">9</int>
+ <string key="id">9</string>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
- <int key="objectID">0</int>
+ <string key="id">0</string>
<array key="object" id="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">-2</int>
+ <string key="id">-2</string>
<reference key="object" ref="1001"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">-1</int>
+ <string key="id">-1</string>
<reference key="object" ref="1003"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">-3</int>
+ <string key="id">-3</string>
<reference key="object" ref="1004"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">1</int>
+ <string key="id">1</string>
<reference key="object" ref="1005"/>
<array class="NSMutableArray" key="children">
<reference ref="1006"/>
@@ -194,7 +196,7 @@
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">2</int>
+ <string key="id">2</string>
<reference key="object" ref="1006"/>
<array class="NSMutableArray" key="children">
<reference ref="950810926"/>
@@ -203,12 +205,12 @@
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">3</int>
+ <string key="id">3</string>
<reference key="object" ref="950810926"/>
<reference key="parent" ref="1006"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">7</int>
+ <string key="id">7</string>
<reference key="object" ref="873347688"/>
<reference key="parent" ref="1006"/>
</object>
@@ -218,6 +220,8 @@
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="YES" key="1.IBNSWindowAutoPositionCentersHorizontal"/>
+ <boolean value="YES" key="1.IBNSWindowAutoPositionCentersVertical"/>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1.IBWindowTemplateEditedContentRect">{{305, 397}, {640, 380}}</string>
<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/>
@@ -229,7 +233,6 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">10</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -296,13 +299,18 @@
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+ <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
<real value="1060" key="NS.object.0"/>
</object>
+ <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+ <real value="1060" key="NS.object.0"/>
+ </object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
- <real value="3200" key="NS.object.0"/>
+ <integer value="4600" key="NS.object.0"/>
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff -r 5fca6586773b -r 733544ee342e README.md
--- a/README.md Wed Oct 30 23:45:47 2013 -0400
+++ b/README.md Thu Oct 31 12:22:21 2013 +0100
@@ -1,9 +1,9 @@
[Adium](http://adium.im)
========================
-[](https://sourceforge.net/projects/adium/files/Adium_1.5.7.dmg/download?accel_key=67%3A1373330536%3Ahttps%253A//adium.im/%3A20578a1d%246c0ac46006327d57ebeb294a94d676fc046839e9&click_id=6718b910-e830-11e2-898a-0200ac1d1d8c-1&source=accel)
+[](https://sourceforge.net/projects/adium/files/Adium_1.5.8.dmg/download?accel_key=67%3A1382826588%3Ahttps%253A//www.adium.im/%3A4df3bdae%249307b389bd2bf68b9102c79e586756ec533fe7d2&click_id=1f3aa4e6-3e8e-11e3-a034-0200ac1d1d9b-1&source=accel)
-[Download Adium 1.5.7](https://sourceforge.net/projects/adium/files/Adium_1.5.7.dmg/download?accel_key=67%3A1373330536%3Ahttps%253A//adium.im/%3A20578a1d%246c0ac46006327d57ebeb294a94d676fc046839e9&click_id=6718b910-e830-11e2-898a-0200ac1d1d8c-1&source=accel)
+[Download Adium 1.5.8](https://sourceforge.net/projects/adium/files/Adium_1.5.8.dmg/download?accel_key=67%3A1382826588%3Ahttps%253A//www.adium.im/%3A4df3bdae%249307b389bd2bf68b9102c79e586756ec533fe7d2&click_id=1f3aa4e6-3e8e-11e3-a034-0200ac1d1d9b-1&source=accel)
## About Adium ##
diff -r 5fca6586773b -r 733544ee342e Release/Makefile
--- a/Release/Makefile Wed Oct 30 23:45:47 2013 -0400
+++ b/Release/Makefile Thu Oct 31 12:22:21 2013 +0100
@@ -17,7 +17,7 @@
# - make all
###########
-VERSION=1.5.9hg
+VERSION=1.5.9b1
BUILD_IN_DEBUG_MODE?=TRUE
BETA?=TRUE
OFFICIAL_BUILD?=TRUE
diff -r 5fca6586773b -r 733544ee342e Resources/Credits.rtf
--- a/Resources/Credits.rtf Wed Oct 30 23:45:47 2013 -0400
+++ b/Resources/Credits.rtf Thu Oct 31 12:22:21 2013 +0100
@@ -1,6 +1,6 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
+{\rtf1\ansi\ansicpg1252\cocoartf1265
{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
-{\colortbl;\red255\green255\blue255;}
+{\colortbl;\red255\green255\blue255;\red38\green38\blue38;}
\vieww12600\viewh10200\viewkind0
\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40
@@ -548,8 +548,8 @@
\CocoaLigature0 \'95\CocoaLigature1 Meanwhile, a GPLd Lotus Sametime\'ae library\
<http://meanwhile.sourceforge.net/>\
\
- \CocoaLigature0 \'95\CocoaLigature1 \CocoaLigature0 \CocoaLigature1 MGTwitterEngine, a Twitter library by Matt Gemmell\
- <http://mattgemmell.com/>\CocoaLigature0 \
+ \CocoaLigature0 \'95\CocoaLigature1 \CocoaLigature0 \CocoaLigature1 STTwitter, a Twitter library by \cf2 Nicolas Seriot\cf0 \
+ <https://github.com/nst/STTwitter>\CocoaLigature0 \
\CocoaLigature1 \
\CocoaLigature0 \'95\CocoaLigature1 Off-the-Record messaging, an encryption library\
<https://www.cypherpunks.ca/>\
diff -r 5fca6586773b -r 733544ee342e Source/AIListController.m
--- a/Source/AIListController.m Wed Oct 30 23:45:47 2013 -0400
+++ b/Source/AIListController.m Thu Oct 31 12:22:21 2013 +0100
@@ -44,6 +44,8 @@
#import <AIUtilities/AIFunctions.h>
#import <AIUtilities/AIEventAdditions.h>
#import <AIUtilities/AIAttributedStringAdditions.h>
+#import <AIUtilities/AIOSCompatibility.h>
+#import <AIUtilities/AIApplicationAdditions.h>
#define EDGE_CATCH_X 40.0f
#define EDGE_CATCH_Y 40.0f
@@ -338,9 +340,10 @@
boundingFrame = screenFrame;
//We still should not violate the menuBar, so account for it here if we are on the menuBar screen.
- if ((screens = [NSScreen screens]) &&
+ if (([NSApp isOnMavericksOrNewer] && [NSScreen screensHaveSeparateSpaces]) ||
+ ((screens = [NSScreen screens]) &&
([screens count]) &&
- (currentScreen == [screens objectAtIndex:0])) {
+ (currentScreen == [screens objectAtIndex:0]))) {
boundingFrame.size.height -= MENU_BAR_HEIGHT;
}
diff -r 5fca6586773b -r 733544ee342e Source/AdiumSetupWizard.m
--- a/Source/AdiumSetupWizard.m Wed Oct 30 23:45:47 2013 -0400
+++ b/Source/AdiumSetupWizard.m Thu Oct 31 12:22:21 2013 +0100
@@ -273,7 +273,7 @@
[[textView_addAccountMessage enclosingScrollView] setDrawsBackground:NO];
NSAttributedString *accountMessage = [AIHTMLDecoder decodeHTML:
- AILocalizedString(@"<HTML>To chat with your friends, family, and coworkers, you must have an instant messaging account on the same service they do. Choose a service, name, and password below; if you don't have an account yet, click <A HREF=\"https://adium.im/help/pgs/Accounts-CreatingAccounts.html\">here</A> for more information.\n\nAdium supports as many accounts as you want to add; you can always add more in the "Accounts" pane of the Adium Preferences.</HTML>", nil)
+ AILocalizedString(@"<HTML>To chat with your friends, family, and coworkers, you must have an instant messaging account on the same service they do. Choose a service, name, and password below; if you don't have an account yet, click <A HREF=\"https://adium.im/help/pgs/Accounts-CreatingAccounts.html#signing_up_for_an_account\">here</A> for more information.\n\nAdium supports as many accounts as you want to add; you can always add more in the "Accounts" pane of the Adium Preferences.</HTML>", nil)
withDefaultAttributes:[[textView_addAccountMessage textStorage] attributesAtIndex:0
effectiveRange:NULL]];
[[textView_addAccountMessage textStorage] setAttributedString:accountMessage];
More information about the commits
mailing list