adium 5896:9db8b48c8cf6: Merged adium-1.5.11 into adium-1.6.

commits at adium.im commits at adium.im
Tue Dec 16 12:33:09 UTC 2014 

details:	http://hg.adium.im/adium/rev/9db8b48c8cf6
revision:	5896:9db8b48c8cf6
branch:		adium-1.6
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Tue Dec 16 13:32:57 2014 +0100

Merged adium-1.5.11 into adium-1.6.

diffs (261 lines):

diff -r bcd8c770a402 -r 9db8b48c8cf6 AdiumHelp/pgs/AdvancedFeatures-Events.html
--- a/AdiumHelp/pgs/AdvancedFeatures-Events.html	Sun Jul 20 23:06:22 2014 -0400
+++ b/AdiumHelp/pgs/AdvancedFeatures-Events.html	Tue Dec 16 13:32:57 2014 +0100
@@ -30,7 +30,7 @@
 		<li>play a sound when contacts sign on</li>
 		<li>open a chat window when a specific contacts signs on.</li>
 	</ul>	
-	<p>For events, actions can be added and removed. Events can be edited globally and on a per-contact basis.</p>
+	<p>For events, actions can be added and removed. Events can be edited globally as well as on a per-contact basis and on a per-group basis.</p>
 		</div>
 	</div>
 	<div class="taskboxline">
@@ -73,7 +73,7 @@
 			<h3>Editing events on a per-contact basis</h3>
 		</div>
 		<div class="taskboxtext">
-	<p>To edit an event on a per-contact basis, first click "Get Info…" (⇧⌘I) from the <strong>Contact</strong> menu and select the third pane called "Events".</p>
+	<p>To edit an event on a per-contact/per-group basis, select the contact/group in question, click "Get Info…" (⇧⌘I) from the <strong>Contact</strong> menu and select the third pane called "Events".</p>
 	<p>To add an action for an event</p>
 	<ul>
 		<li>Select the event.</li>
diff -r bcd8c770a402 -r 9db8b48c8cf6 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Sun Jul 20 23:06:22 2014 -0400
+++ b/ChangeLogs/Changes.txt	Tue Dec 16 13:32:57 2014 +0100
@@ -81,7 +81,7 @@
  Yahoo
   * Fixed ampersands being encoded mistakenly when adding a link. (#13429)
 
-Version 1.5.10 (04/XX/2014)
+Version 1.5.10 (05/19/2014)
  * Updated libpurple to 2.10.9, fixing many security issues.
  * Updated the PSMTabBarControl framework, used in Adium for tabs:
    * Fixed an issue which occurred when dragging a conversation window into an existing tabbed conversation window and which caused Adium to become unresponsive. (#16281)
@@ -96,7 +96,7 @@
  * Fixed idle checks to no longer use the proximity sensor of modern Macs. (Christopher Loessl)
  * Fixed dates in the chat log viewer not showing up for very old logs (2006 and earlier). (#16554)
  * Security: Enabled a number of TLS ciphers using SHA256.
- * Fixed connecting to servers with outdated TLS support using the unofficial SIPE plugin. (Michael Lamb) (#16550)
+ * Fixed connecting to servers with outdated TLS support using the unofficial SIPE plugin. (Michael Lamb) (#16550) The fix only applies to OS X 10.9, one for OS X 10.8.5 should follow.
  * Fixed vertical placement of the unread count in tabs. (#16318)
  * Fixed a misbehaving link in the Setup Wizard. (#16587)
 
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/ca.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/ca.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/cs.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/cs.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/da.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/da.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/de.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/de.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/el_GR.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/el_GR.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/en_AU.lproj/Localizable.strings
--- a/Frameworks/Adium Framework/Resources/en_AU.lproj/Localizable.strings	Sun Jul 20 23:06:22 2014 -0400
+++ b/Frameworks/Adium Framework/Resources/en_AU.lproj/Localizable.strings	Tue Dec 16 13:32:57 2014 +0100
@@ -250,7 +250,7 @@
 /* No comment provided by engineer. */
 "Join Chat" = "Join Chat";
 
-/* Text of the typing preference checkbox in the account preferneces */
+/* Text of the typing preference checkbox in the account preferences */
 "Let others know when you are typing" = "Let others know when you are typing";
 
 /* Label for the login server field in the account preferences */
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/en_GB.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/en_GB.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/es.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/es.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/fi.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/fi.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/fr.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/fr.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/fr_CA.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/fr_CA.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/hu.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/hu.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/is.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/is.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/it.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/it.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/ja.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/ja.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/nb.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/nb.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/nl.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/nl.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/pl.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/pl.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/pt.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/pt.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/pt_PT.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/pt_PT.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/ru.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/ru.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/sk_SK.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/sk_SK.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/sl.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/sl.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/sv.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/sv.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/tr.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/tr.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/uk.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/uk.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/zh_CN.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/zh_CN.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Resources/zh_TW.lproj/Localizable.strings
Binary file Frameworks/Adium Framework/Resources/zh_TW.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Frameworks/Adium Framework/Source/AIAccountViewController.m
--- a/Frameworks/Adium Framework/Source/AIAccountViewController.m	Sun Jul 20 23:06:22 2014 -0400
+++ b/Frameworks/Adium Framework/Source/AIAccountViewController.m	Tue Dec 16 13:32:57 2014 +0100
@@ -392,7 +392,7 @@
 {
 	[label_password setLocalizedString:AILocalizedStringFromTableInBundle(@"Password:", nil, [NSBundle bundleForClass:[AIAccountViewController class]], "Label for the password field in the account preferences")];
 	[label_typing setLocalizedString:AILocalizedStringFromTableInBundle(@"Typing:", nil, [NSBundle bundleForClass:[AIAccountViewController class]], "Label beside the 'let others know when you are typing' checkbox in the account preferences")];
-	[checkBox_sendTyping setLocalizedString:AILocalizedStringFromTableInBundle(@"Let others know when you are typing", nil, [NSBundle bundleForClass:[AIAccountViewController class]], "Text of the typing preference checkbox in the account preferneces")];
+	[checkBox_sendTyping setLocalizedString:AILocalizedStringFromTableInBundle(@"Let others know when you are typing", nil, [NSBundle bundleForClass:[AIAccountViewController class]], "Text of the typing preference checkbox in the account preferences")];
 	[label_encryption setLocalizedString:AILocalizedStringFromTableInBundle(@"Encryption:", nil, [NSBundle bundleForClass:[AIAccountViewController class]], "Label besides the encryption preference menu")];
 	[label_alias setLocalizedString:AILocalizedStringFromTableInBundle(@"Alias:", nil, [NSBundle bundleForClass:[AIAccountViewController class]], nil)];
 	[label_port setLocalizedString:AILocalizedStringFromTableInBundle(@"Port:", nil, [NSBundle bundleForClass:[AIAccountViewController class]], "Label for the port field in the account preferences")];
diff -r bcd8c770a402 -r 9db8b48c8cf6 Plists/Info.plist
--- a/Plists/Info.plist	Sun Jul 20 23:06:22 2014 -0400
+++ b/Plists/Info.plist	Tue Dec 16 13:32:57 2014 +0100
@@ -354,7 +354,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Adium</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.6hg, Copyright © 2001-2013 The Adium Team</string>
+	<string>1.6hg, Copyright © 2001-2014 The Adium Team</string>
 	<key>CFBundleHelpBookFolder</key>
 	<string>AdiumHelp</string>
 	<key>CFBundleHelpBookName</key>
diff -r bcd8c770a402 -r 9db8b48c8cf6 Plugins/Purple Service/Resources/en_GB.lproj/Localizable.strings
Binary file Plugins/Purple Service/Resources/en_GB.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c
--- a/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c	Sun Jul 20 23:06:22 2014 -0400
+++ b/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c	Tue Dec 16 13:32:57 2014 +0100
@@ -648,26 +648,38 @@
 {
 	PurpleSslCDSAData *cdsa_data = PURPLE_SSL_CDSA_DATA(gsc);
 	OSStatus	err;			/* Error info */
-	size_t		processed;		/* Number of bytes processed */
+	size_t		processed = 0;		/* Number of bytes processed */
 	size_t		result;			/* Return value */
 
     errno = 0;
     err = SSLRead(cdsa_data->ssl_ctx, data, len, &processed);
-	switch (err) {
-		case noErr:
-			result = processed;
-			break;
-		case errSSLWouldBlock:
-			errno = EAGAIN;
-			result = ((processed > 0) ? processed : -1);
-			break;
-		case errSSLClosedGraceful:
-			result = 0;
-			break;
-		default:
-			result = -1;
-			purple_debug_error("cdsa", "receive failed (%d): %s\n", (int)err, strerror(errno));
-			break;
+	if (processed <= 0) {
+		switch (err) {
+			case noErr:
+				result = processed;
+				break;
+			case errSSLWouldBlock:
+				errno = EAGAIN;
+				result = ((processed > 0) ? processed : -1);
+				break;
+			case errSSLClosedGraceful:
+				result = 0;
+				break;
+			case errSSLClosedNoNotify:
+				result = ((processed > 0) ? processed : 0);
+				purple_debug_info("cdsa", "receive got a premature termination" );
+				break;
+			case errSSLClosedAbort:
+				result = ((processed > 0) ? processed : 0);
+				purple_debug_info("cdsa", "receive got a premature termination" );
+				break;
+			default:
+				result = -1;
+				purple_debug_error("cdsa", "receive failed (%d): %s\n", (int)err, strerror(errno));
+				break;
+		}
+	} else {
+		result = processed;
 	}
 
     return result;
@@ -699,6 +711,14 @@
 			case errSSLClosedGraceful:
 				result = 0;
 				break;
+			case errSSLClosedNoNotify:
+				result = ((processed > 0) ? processed : 0);
+				purple_debug_info("cdsa", "send got a premature termination" );
+				break;
+			case errSSLClosedAbort:
+				result = ((processed > 0) ? processed : 0);
+				purple_debug_info("cdsa", "send got a premature termination" );
+				break;
 			default:
 				result = -1;
 				purple_debug_error("cdsa", "send failed (%d): %s\n", (int)err, strerror(errno));
diff -r bcd8c770a402 -r 9db8b48c8cf6 Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.m
--- a/Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.m	Sun Jul 20 23:06:22 2014 -0400
+++ b/Plugins/Twitter Plugin/STTwitter/STTwitterOAuth.m	Tue Dec 16 13:32:57 2014 +0100
@@ -578,7 +578,7 @@
 
 @implementation NSString (STTwitterOAuth)
 
-+ (NSString *)randomString {
++ (NSString *)st_randomString {
     CFUUIDRef cfuuid = CFUUIDCreate (kCFAllocatorDefault);
     NSString *uuid = (NSString *)CFUUIDCreateString (kCFAllocatorDefault, cfuuid);
     CFRelease (cfuuid);
@@ -586,7 +586,7 @@
 }
 
 + (NSString *)random32Characters {
-    NSString *randomString = [self randomString];
+    NSString *randomString = [self st_randomString];
     
     NSAssert([randomString length] >= 32, @"");
     
diff -r bcd8c770a402 -r 9db8b48c8cf6 README.md
--- a/README.md	Sun Jul 20 23:06:22 2014 -0400
+++ b/README.md	Tue Dec 16 13:32:57 2014 +0100
@@ -1,9 +1,11 @@
 [Adium](https://adium.im)
 ========================
 
-[![Adiumy](https://adium.im/images/logo.png)](https://sourceforge.net/projects/adium/files/Adium_1.5.9.dmg/download?accel_key=67%3A1386175847%3Ahttps%253A//adium.im/%3A64fc072b%242796f9fa06c20c320881147a26394ee76682951e&click_id=399ffab8-5d04-11e3-b3d1-0200ac1d1d96-1&source=accel)
+-[![Adiumy](https://adium.im/images/logo.png)](https://sourceforge.net/projects/adium/files/Adium_1.5.9.dmg/download?accel_key=67%3A1386175847%3Ahttps%253A//adium.im/%3A64fc072b%242796f9fa06c20c320881147a26394ee76682951e&click_id=399ffab8-5d04-11e3-b3d1-0200ac1d1d96-1&source=accel)
++[![Adiumy](https://adium.im/images/logo.png)](https://sourceforge.net/projects/adium/files/Adium_1.5.10.dmg/download?accel_key=67%3A1400803646%3Ahttps%253A//adium.im/%3A5c8289c7%2445aedffbd5670cadf988490fc5ac9588a4a1621e&click_id=38f81be2-e20e-11e3-8070-0200ac1d1d8c-1&source=accel)
 
-[Download Adium 1.5.9](https://sourceforge.net/projects/adium/files/Adium_1.5.9.dmg/download?accel_key=67%3A1386175847%3Ahttps%253A//adium.im/%3A64fc072b%242796f9fa06c20c320881147a26394ee76682951e&click_id=399ffab8-5d04-11e3-b3d1-0200ac1d1d96-1&source=accel)
+-[Download Adium 1.5.9](https://sourceforge.net/projects/adium/files/Adium_1.5.9.dmg/download?accel_key=67%3A1386175847%3Ahttps%253A//adium.im/%3A64fc072b%242796f9fa06c20c320881147a26394ee76682951e&click_id=399ffab8-5d04-11e3-b3d1-0200ac1d1d96-1&source=accel)
++[Download Adium 1.5.10](https://sourceforge.net/projects/adium/files/Adium_1.5.10.dmg/download?accel_key=67%3A1400803646%3Ahttps%253A//adium.im/%3A5c8289c7%2445aedffbd5670cadf988490fc5ac9588a4a1621e&click_id=38f81be2-e20e-11e3-8070-0200ac1d1d8c-1&source=accel)
 
 ## About Adium ##
 
diff -r bcd8c770a402 -r 9db8b48c8cf6 Resources/de.lproj/Localizable.strings
Binary file Resources/de.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Resources/en_GB.lproj/Localizable.strings
Binary file Resources/en_GB.lproj/Localizable.strings has changed
diff -r bcd8c770a402 -r 9db8b48c8cf6 Source/AIListWindowController.m
--- a/Source/AIListWindowController.m	Sun Jul 20 23:06:22 2014 -0400
+++ b/Source/AIListWindowController.m	Tue Dec 16 13:32:57 2014 +0100
@@ -552,7 +552,7 @@
 		[self slideWindowOnScreenWithAnimation:NO];
 
 	} else {
-		//Do a slide immediately if needed (to display as per our new preferneces)
+		//Do a slide immediately if needed (to display as per our new preferences)
 		[self slideWindowIfNeeded:nil];
 		
 	}

More information about the commits mailing list