adium/adium

merge adium-1.5.8 into adium-1.6
adium-1.6
2013-07-13, Frank Dowsett
554440dd29ca
merge adium-1.5.8 into adium-1.6
--- a/Adium.xcodeproj/project.pbxproj Tue Jul 09 21:00:11 2013 +0200
+++ b/Adium.xcodeproj/project.pbxproj Sat Jul 13 12:46:57 2013 -0400
@@ -1067,6 +1067,8 @@
5ACF273A1392C74A004B6AEF /* AIHighlightingTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ACF27361392C74A004B6AEF /* AIHighlightingTextField.m */; };
5ACF273B1392C74A004B6AEF /* AIPreferenceCollectionView.h in Headers */ = {isa = PBXBuildFile; fileRef = 5ACF27371392C74A004B6AEF /* AIPreferenceCollectionView.h */; };
5ACF273C1392C74A004B6AEF /* AIPreferenceCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ACF27381392C74A004B6AEF /* AIPreferenceCollectionView.m */; };
+ 5AC423F3178CBD5100F5911A /* ChatCyclingDefaults-Old.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E815F85DD300F32F9B /* ChatCyclingDefaults-Old.plist */; };
+ 5AC423F7178CBD5700F5911A /* ChatCyclingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D7F1E915F85DD300F32F9B /* ChatCyclingDefaults.plist */; };
5ADFFE5D133846C300069C1B /* keys.png in Resources */ = {isa = PBXBuildFile; fileRef = 5ADFFE5C133846C300069C1B /* keys.png */; };
5AEE60011602BAE200304672 /* AIBoolToControlTextColorTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 979AA6A614D59DC8008730DF /* AIBoolToControlTextColorTransformer.m */; };
6311F4710E340DD2004234B8 /* AISharedAdium.h in Headers */ = {isa = PBXBuildFile; fileRef = 6311F46F0E340DD2004234B8 /* AISharedAdium.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -9988,6 +9990,8 @@
C613B143164112B3006683FF /* events-dock-name.tiff in Resources */,
C613B1451641210B006683FF /* events-contact.tiff in Resources */,
5A0BBC4317400544002A7BE0 /* emoticons_menu@2x.png in Resources */,
+ 5AC423F3178CBD5100F5911A /* ChatCyclingDefaults-Old.plist in Resources */,
+ 5AC423F7178CBD5700F5911A /* ChatCyclingDefaults.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
--- a/AdiumHelp/pgs/Accounts-CreatingAccounts.html Tue Jul 09 21:00:11 2013 +0200
+++ b/AdiumHelp/pgs/Accounts-CreatingAccounts.html Sat Jul 13 12:46:57 2013 -0400
@@ -61,7 +61,6 @@
<li><a class="ext_link" href="http://www.livejournal.com/chat/">LiveJournal</a></li>
<li><a class="ext_link" href="http://www.passport.com/">MSN Messenger</a></li>
<li><a class="ext_link" href="http://edit.yahoo.com/">Yahoo!Messenger</a></li>
- <li><a class="ext_link" href="https://trac.adium.im/wiki/Zephyr">Zephyr</a></li>
</ul>
</li>
<li>Paid Services
--- a/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html Tue Jul 09 21:00:11 2013 +0200
+++ b/AdiumHelp/pgs/AdvancedFeatures-AdiumXtras.html Sat Jul 13 12:46:57 2013 -0400
@@ -68,7 +68,7 @@
<h3>Getting support for an Xtra</h3>
</div>
<div class="taskboxtext">
- <p>An Xtra installed from the Adium Xtras site is supported by the Xtra's author. The first place to seek support is on the Xtra's page, probably in the comments unless the Author has given other instructions. If that doesn't work, try the <a class="ext_link" href="http://forum.adium.im/">Adium forums</a>.</p>
+ <p>An Xtra installed from the Adium Xtras site is supported by the Xtra's author. The first place to seek support is on the Xtra's page, probably in the comments unless the author has given other instructions. If that doesn't work, try the <a class="ext_link" href="http://forums.cocoaforge.com/viewforum.php?f=13">Adium forum</a>.</p>
</div>
</div>
<div class="taskboxline">
--- a/AdiumHelp/pgs/AdvancedFeatures-VisualNotifications.html Tue Jul 09 21:00:11 2013 +0200
+++ b/AdiumHelp/pgs/AdvancedFeatures-VisualNotifications.html Sat Jul 13 12:46:57 2013 -0400
@@ -38,8 +38,8 @@
<div class="taskboxtext">
<p>The third-party application Growl.app has been around about as long as Adium itself – a long time before Apple introduced "Notification Center" (NC) in OS X 10.8 ("Mountain Lion").</p>
<p>While Growl.app is the obvious solution for users on previous versions of OS X, it also has a lot to offer to OS X users on 10.8, especially in the way of customisability and extendability. For example, there are dozens of different styles to choose from.</p>
- <p>To install Growl.app either <a class="ext_link" href="https://itunes.apple.com/de/app/growl/id467939042?mt=12">buy the application from the Mac App Store</a>, or get an older and free version from <a class="ext_link" href="http://growl.info/downloads">http://growl.info/downloads</a>.</p>
- <p>If you have Growl.app installed and would prefer to use Notification Center notifications for Adium, you need make the change in Growl's preferences.</p>
+ <p>To install Growl.app either <a class="ext_link" href="https://itunes.apple.com/de/app/growl/id467939042?mt=12">buy the application from the Mac App Store</a> (recommended, it's not expensive), or get an older and free version from <a class="ext_link" href="http://growl.info/downloads">http://growl.info/downloads</a> (not recommended and not supported on OS X 10.8 and later).</p>
+ <p>If you have Growl.app installed and would prefer to use Notification Center notifications for Adium, you need to make the change in Growl's preferences.</p>
<p>To uninstall the Growl application, follow the <a class="ext_link" href="http://growl.info/documentation/growl-package-removal.php">instructions on the Growl website</a>.</p>
</div>
</div>
@@ -50,7 +50,7 @@
<p align="center"> <img src="../gfx/MistNotification.png" alt="" /></p>
<div class="taskboxtext">
<p>As of Adium 1.5, Adium is able to show Growl-style notifications on OS X versions 10.7 and 10.6 without the Growl application installed. This feature is called <a class="ext_link" href="http://growl.info/notetodevelopers">Mist</a>.</p>
- <p>If you want to use a different style or use some of the more advanced features of Growl, you will have to either <a class="ext_link" href="https://itunes.apple.com/de/app/growl/id467939042?mt=12">buy the application from the Mac App Store</a>, or get an older and free version from <a class="ext_link" href="http://growl.info/downloads">http://growl.info/downloads</a>.</p>
+ <p>If you want to use a different style or use some of the more advanced features of Growl, you will have to either <a class="ext_link" href="https://itunes.apple.com/de/app/growl/id467939042?mt=12">buy the application from the Mac App Store</a> (recommended, it's not expensive), or get an older and free version from <a class="ext_link" href="http://growl.info/downloads">http://growl.info/downloads</a> (not recommended and not supported on OS X 10.8 and later).</p>
<p>To disable Mist notifications, enter this command in Terminal.app: <code>defaults write -g com.growl.growlframework.mist.enabled -bool NO</code>. Please note that this affects any apps that support built-in Mist notifications like Adium does.<p>
</div>
</div>
--- a/AdiumHelp/pgs/Messaging-GroupChat.html Tue Jul 09 21:00:11 2013 +0200
+++ b/AdiumHelp/pgs/Messaging-GroupChat.html Sat Jul 13 12:46:57 2013 -0400
@@ -24,7 +24,7 @@
<h3>Initiating/joining a group chat</h3>
</div>
<div class="taskboxtext">
- <p><b>AIM, Jabber, SameTime, Yahoo, Zephyr</b></p>
+ <p><b>AIM, Jabber, SameTime, Yahoo</b></p>
<p>Choose <b>File</b> → <b>Join Group</b> Chat and enter the details for the chat. You may invite contacts to join you in the chat immediately via the Join Group Chat window, and you may invite them later by:</p>
<ul>
<li>Selecting them in the contact list and choosing <b>Contact</b> → <b>Invite to Chat</b> and selecting the chat, or</li>
--- a/AdiumHelp/pgs/ServiceInformation-TwitterSupport.html Tue Jul 09 21:00:11 2013 +0200
+++ b/AdiumHelp/pgs/ServiceInformation-TwitterSupport.html Sat Jul 13 12:46:57 2013 -0400
@@ -34,7 +34,7 @@
</div>
<div class="taskboxline">
<div class="taskboxheader">
- <h3>Showing people your followers in the contact list</h3>
+ <h3>Showing your followers in the contact list</h3>
</div>
<div class="taskboxtext">
<p>By default, your followers are shown in your contact list. This setting can be edited in the <strong>Options</strong> tab of your Twitter account's preferences.</p>
--- a/AdiumHelp/pgs/Troubleshooting-RecoveringLostPasswords.html Tue Jul 09 21:00:11 2013 +0200
+++ b/AdiumHelp/pgs/Troubleshooting-RecoveringLostPasswords.html Sat Jul 13 12:46:57 2013 -0400
@@ -24,7 +24,7 @@
<h3>Looking your password up in Keychain Access</h3>
</div>
<div class="taskboxtext">
- <p>If you don't remember what service you use, you'll first need to open up the Accounts pane of Adium's Preferences, and then refer to the <a href="https://trac.adium.im/wiki/ListOfServices">"ListOfServices"</a> entry on the online Adium Wiki to determine the name of the service.</p>
+ <p>If you don't remember what service you use, you'll first need to open up the Accounts pane of Adium's Preferences, and then refer to <a href="Accounts-ListOfServices.html">"ListOfServices"</a> to determine the name of the service.</p>
<ol>
<li>Launch Keychain Access.
<div style="float:right"><img src="../gfx/RecoveringLostPasswords-KeychainAccess.png" alt="Path to Keychain Access." /></div>
@@ -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-CreatingAnAccount.html">Creating an Account</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">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>
--- a/ChangeLogs/Changes.txt Tue Jul 09 21:00:11 2013 +0200
+++ b/ChangeLogs/Changes.txt Sat Jul 13 12:46:57 2013 -0400
@@ -63,10 +63,11 @@
- Fixed DNS leaks in libpurple. / Added a "Tor (SOCKS5)" proxy option, which uses the Tor proxy option of libpurple. (#15161)
- "Proxy bypass when registered jabber handle" (#15957)
-Version 1.5.8 (XX/XX/2XXX)
+Version 1.5.8 (XX/XX/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)
+ * XMPP: refer to XMPP as "XMPP (Jabber)". Unfortunately, just "XMPP" still has some potential for confusion. (#16435)
* Fixed SIP accountnames to be case-sensitive. (Pete Woods) (#16237)
* Fixed a bug that could cause Adium and other applications to hang and could lead to corruption of the Keychain when permanently trusting an untrusted SSL certificate. (#16365)
-
Version 1.5.7 (7/2/2013)
* Updated Twitter support. (#16118)
--- a/Plugins/Twitter Plugin/STTwitter/STTwitterAPIWrapper.m Tue Jul 09 21:00:11 2013 +0200
+++ b/Plugins/Twitter Plugin/STTwitter/STTwitterAPIWrapper.m Sat Jul 13 12:46:57 2013 -0400
@@ -75,7 +75,7 @@
appOnly.consumerSecret = consumerSecret;
twitter.oauth = appOnly;
- return twitter;
+ return [twitter autorelease];
}
- (void)postTokenRequest:(void(^)(NSURL *url, NSString *oauthToken))successBlock oauthCallback:(NSString *)oauthCallback errorBlock:(void(^)(NSError *error))errorBlock {
--- a/README.md Tue Jul 09 21:00:11 2013 +0200
+++ b/README.md Sat Jul 13 12:46:57 2013 -0400
@@ -1,14 +1,13 @@
[Adium](http://adium.im)
========================
-[![Adiumy](http://adium.im/images/logo.png)](http://sourceforge.net/projects/adium/files/Adium_1.5.4.dmg/download?accel_key=67%3A1360794271%3Ahttp%253A//adium.im/%3Aec915758%24f8e0c76eb0905e3055634c1a54b58137212a866d&click_id=2360e5ce-762c-11e2-bea6-0200ac1d1d8a&source=accel)
+[![Adiumy](http://adium.im/images/logo.png)](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.4](http://sourceforge.net/projects/adium/files/Adium_1.5.4.dmg/download?accel_key=67%3A1360794271%3Ahttp%253A//adium.im/%3Aec915758%24f8e0c76eb0905e3055634c1a54b58137212a866d&click_id=2360e5ce-762c-11e2-bea6-0200ac1d1d8a&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)
## About Adium ##
-Adium is a free and open source instant messaging application for [OS X](https://www.apple.com/osx/), written using OS X's Cocoa API, released under the [GNU GPL](http://www.gnu.org/licenses/licenses.html#GPL) and developed by [the Adium team](https://trac.adium.im/wiki/AdiumTeam).</p>
-Based on the [libpurple](https://trac.adium.im/wiki/LibPurple) protocol library, Adium can connect you to any number of messaging accounts on any combination of supported messaging services and then chat with other people using those services.
+Adium is a free and open source instant messaging application for [OS X](https://www.apple.com/osx/), written using OS X's Cocoa API, released under the [GNU GPL](http://www.gnu.org/licenses/licenses.html#GPL) and developed by [the Adium team](https://trac.adium.im/wiki/AdiumTeam). Based on the [libpurple](https://trac.adium.im/wiki/LibPurple) protocol library, Adium can connect you to any number of messaging accounts on any combination of supported messaging services and then chat with other people using those services.
## Notable Features ##
* Open Source, so everyone can see how Adium works and [help improve it](https://trac.adium.im/wiki/Development)
--- a/Source/AdiumSetupWizard.m Tue Jul 09 21:00:11 2013 +0200
+++ b/Source/AdiumSetupWizard.m Sat Jul 13 12:46:57 2013 -0400
@@ -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=\"http://trac.adium.im/wiki/CreatingAnAccount#Sigingupforanaccount\">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\">here</A> for more information.\n\nAdium supports as many accounts as you want to add; you can always add more in the &#34;Accounts&#34; pane of the Adium Preferences.</HTML>", nil)
withDefaultAttributes:[[textView_addAccountMessage textStorage] attributesAtIndex:0
effectiveRange:NULL]];
[[textView_addAccountMessage textStorage] setAttributedString:accountMessage];