Merged adium-1.6 into default.
authorThijs Alkemade <me@thijsalkema.de>
Tue, 05 Mar 2013 12:43:30 +0100
changeset 5375 ca5229914ebc
parent 5363 7bf5466e8548 (current diff)
parent 5374 7f323107cd5f (diff)
child 5377 a9f4102abb03
Merged adium-1.6 into default.
ChangeLogs/Changes.txt
Frameworks/Adium Framework/Source/AIAccountViewController.m
Plists/Info.plist
Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.m
Release/Makefile
Source/AIStandardListWindowController.m
Source/AIStateMenuPlugin.m
--- a/ChangeLogs/Changes.txt	Sun Feb 24 00:02:34 2013 +0100
+++ b/ChangeLogs/Changes.txt	Tue Mar 05 12:43:30 2013 +0100
@@ -10,8 +10,15 @@
  Accessibility
   * Fixed tabs not being spoken by VoiceOver. (#16088)
 
-Version 1.5.5 (X/X/X)
+Version 1.5.6 (3/XX/2013)
+ * Fix a crash on startup on 10.6.8.
+ * Fix a crash when accepting or canceling the certificate verification dialog. (#16280)
+
+Version 1.5.5 (2/24/2013)
+ * Updated libpurple to 2.10.7 fixing two security vulnerabilities.
  * Fixed "Add Link..." when the cursor is at the end of the line. (#16200)
+ * Made sure the "Open Link" menu item in the chat window's context menu gets removed for other translations than English as well. Clicking the menu item wouldn't open the link in your default browser but in the chat window itself. (#16101)
+ * Fixed reference to an image. (Detmud) (#16301)
  * Updated Spanish translation. (#16291)
 
  Chat window
@@ -61,7 +68,7 @@
 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.4 (11/4/2012)
+Version 1.5.4 (11/7/2012)
  * Updated the included Growl SDK to 2.0, adding support for Notification Center on 10.8 if Growl is not installed. (#15867)
  * Updated libotr to 3.2.1, fixing a security vulnerability. (#16122)
  * Updated libpurple to 2.10.6.
--- a/Copyright.txt	Sun Feb 24 00:02:34 2013 +0100
+++ b/Copyright.txt	Tue Mar 05 12:43:30 2013 +0100
@@ -1,5 +1,5 @@
 Adium
-Copyright © 2001-2012 by the following:
+Copyright © 2001-2013 by the following:
 
 Thijs Alkemade
 Adam Atlas
--- a/Frameworks/Adium Framework/Source/AIAccountViewController.m	Sun Feb 24 00:02:34 2013 +0100
+++ b/Frameworks/Adium Framework/Source/AIAccountViewController.m	Tue Mar 05 12:43:30 2013 +0100
@@ -220,7 +220,7 @@
 		//Server Port
 		NSNumber	*port = [account preferenceForKey:KEY_CONNECT_PORT group:GROUP_ACCOUNT_STATUS];
 		if (port) {
-			[textField_connectPort setIntValue:[port intValue]];
+			[textField_connectPort setStringValue:[NSString stringWithFormat:@"%d", [port intValue]]];
 		} else {
 			[textField_connectPort setStringValue:@""];
 		}
Binary file Frameworks/libintl.framework/Versions/0.18.2/libintl has changed
--- a/Plists/Info.plist	Sun Feb 24 00:02:34 2013 +0100
+++ b/Plists/Info.plist	Tue Mar 05 12:43:30 2013 +0100
@@ -354,7 +354,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Adium</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.7hg, Copyright © 2001-2012 The Adium Team</string>
+	<string>1.7hg, Copyright © 2001-2013 The Adium Team</string>
 	<key>CFBundleHelpBookFolder</key>
 	<string>AdiumHelp</string>
 	<key>CFBundleHelpBookName</key>
--- a/Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.m	Sun Feb 24 00:02:34 2013 +0100
+++ b/Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.m	Tue Mar 05 12:43:30 2013 +0100
@@ -175,7 +175,6 @@
 	}
 
 	CFRelease(policyRef);
-	CFRelease(trustRef);
 }
 
 /*
@@ -249,6 +248,9 @@
 		}
 	}
 
+	CFRelease(trustRef);
+	trustRef = NULL;
+	
 	[parentWindow performClose:nil];
 }
 
--- a/ReadMe.rtf	Sun Feb 24 00:02:34 2013 +0100
+++ b/ReadMe.rtf	Tue Mar 05 12:43:30 2013 +0100
@@ -1,4 +1,4 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1138\cocoasubrtf230
+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;\f1\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \viewkind0
@@ -8,7 +8,7 @@
 \f1\fs24 \shad0 \
 \pard\tx960\tx1920\tx2880\tx3840\tx4800\tx5760\tx6720\tx7680\tx8640\tx9600\tx10560\tx11520\tx12480\tx13440\tx14400\tx15360\tx16320\tx17280\tx18240\tx19203\tx20163\tx21123\tx22083\tx23043\tx24003\tx24963\tx25923\tx26883\tx27843\tx28803\tx29763\tx30725\tx31685\tx32645\tx33605\tx34565\tx35525\tx36485\tx37446\tx38406\tx39366\tx40326\tx41286\tx42246\tx43207\tx44167\tx45127\tx46087\tx47047\tx48007\tx48967\tx49927\tx50887\tx51847\tx52807\tx53767\tx54727\tx55687\tx56647\tx57607\tx58567\tx59527\tx60487\tx61450\tx62410\tx63370\tx64330\tx65290\tx66250\tx67210\tx68171\tx69131\tx70091\tx71051\tx72011\tx72971\tx73932\tx74892\tx75852\tx76812\tx77772\tx78732\tx79692\tx80652\tx81612\tx82572\tx83532\tx84492\tx85452\tx86414\tx87374\tx88334\tx89294\tx90254\tx91214\tx92175\tx93135\tx94095\tx95055\tx96015\li1120\fi-1120
 \cf0 \
-    Copyright \'a9 2001-2012 The Adium Team\
+    Copyright \'a9 2001-2013 The Adium Team\
 \pard\tx960\tx1920\tx2880\tx3840\tx4800\tx5760\tx6720\tx7680\tx8640\tx9600\tx10560\tx11520\tx12480\tx13440\tx14400\tx15360\tx16320\tx17280\tx18240\tx19203\tx20163\tx21123\tx22083\tx23043\tx24003\tx24963\tx25923\tx26883\tx27843\tx28803\tx29763\tx30725\tx31685\tx32645\tx33605\tx34565\tx35525\tx36485\tx37446\tx38406\tx39366\tx40326\tx41286\tx42246\tx43207\tx44167\tx45127\tx46087\tx47047\tx48007\tx48967\tx49927\tx50887\tx51847\tx52807\tx53767\tx54727\tx55687\tx56647\tx57607\tx58567\tx59527\tx60487\tx61450\tx62410\tx63370\tx64330\tx65290\tx66250\tx67210\tx68171\tx69131\tx70091\tx71051\tx72011\tx72971\tx73932\tx74892\tx75852\tx76812\tx77772\tx78732\tx79692\tx80652\tx81612\tx82572\tx83532\tx84492\tx85452\tx86414\tx87374\tx88334\tx89294\tx90254\tx91214\tx92175\tx93135\tx94095\tx95055\tx96015\li560\fi-560
 \cf0 \
 \pard\tx960\tx1920\tx2880\tx3840\tx4800\tx5760\tx6720\tx7680\tx8640\tx9600\tx10560\tx11520\tx12480\tx13440\tx14400\tx15360\tx16320\tx17280\tx18240\tx19203\tx20163\tx21123\tx22083\tx23043\tx24003\tx24963\tx25923\tx26883\tx27843\tx28803\tx29763\tx30725\tx31685\tx32645\tx33605\tx34565\tx35525\tx36485\tx37446\tx38406\tx39366\tx40326\tx41286\tx42246\tx43207\tx44167\tx45127\tx46087\tx47047\tx48007\tx48967\tx49927\tx50887\tx51847\tx52807\tx53767\tx54727\tx55687\tx56647\tx57607\tx58567\tx59527\tx60487\tx61450\tx62410\tx63370\tx64330\tx65290\tx66250\tx67210\tx68171\tx69131\tx70091\tx71051\tx72011\tx72971\tx73932\tx74892\tx75852\tx76812\tx77772\tx78732\tx79692\tx80652\tx81612\tx82572\tx83532\tx84492\tx85452\tx86414\tx87374\tx88334\tx89294\tx90254\tx91214\tx92175\tx93135\tx94095\tx95055\tx96015\li1120\fi-1120
Binary file Resources/cs.lproj/InfoPlist.strings has changed
Binary file Resources/da.lproj/InfoPlist.strings has changed
Binary file Resources/el_GR.lproj/InfoPlist.strings has changed
Binary file Resources/en.lproj/InfoPlist.strings has changed
--- a/Resources/en_AU.lproj/InfoPlist.strings	Sun Feb 24 00:02:34 2013 +0100
+++ b/Resources/en_AU.lproj/InfoPlist.strings	Tue Mar 05 12:43:30 2013 +0100
@@ -1,3 +1,3 @@
 
 /* Localized versions of Info.plist keys */
-"NSHumanReadableCopyright" = "© 2001-2012 The Adium Team";
\ No newline at end of file
+"NSHumanReadableCopyright" = "© 2001-2013 The Adium Team";
\ No newline at end of file
Binary file Resources/en_GB.lproj/InfoPlist.strings has changed
Binary file Resources/es.lproj/InfoPlist.strings has changed
Binary file Resources/fi.lproj/InfoPlist.strings has changed
Binary file Resources/fr.lproj/InfoPlist.strings has changed
Binary file Resources/fr_CA.lproj/InfoPlist.strings has changed
Binary file Resources/hu.lproj/InfoPlist.strings has changed
Binary file Resources/is.lproj/InfoPlist.strings has changed
Binary file Resources/it.lproj/InfoPlist.strings has changed
Binary file Resources/ja.lproj/InfoPlist.strings has changed
Binary file Resources/nb.lproj/InfoPlist.strings has changed
Binary file Resources/pl.lproj/InfoPlist.strings has changed
Binary file Resources/pt_PT.lproj/InfoPlist.strings has changed
Binary file Resources/ru.lproj/InfoPlist.strings has changed
Binary file Resources/sl.lproj/InfoPlist.strings has changed
Binary file Resources/sv.lproj/InfoPlist.strings has changed
Binary file Resources/tr.lproj/InfoPlist.strings has changed
Binary file Resources/uk.lproj/InfoPlist.strings has changed
Binary file Resources/zh_CN.lproj/InfoPlist.strings has changed
Binary file Resources/zh_TW.lproj/InfoPlist.strings has changed
--- a/Source/AIStandardListWindowController.m	Sun Feb 24 00:02:34 2013 +0100
+++ b/Source/AIStandardListWindowController.m	Tue Mar 05 12:43:30 2013 +0100
@@ -126,6 +126,7 @@
 - (void)windowWillClose:(NSNotification *)notification
 {
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
+	statusMenu = nil;
 	
 	[super windowWillClose:notification];
 }
--- a/Source/AIStateMenuPlugin.m	Sun Feb 24 00:02:34 2013 +0100
+++ b/Source/AIStateMenuPlugin.m	Tue Mar 05 12:43:30 2013 +0100
@@ -80,8 +80,14 @@
 {
 	[[NSNotificationCenter defaultCenter] removeObserver:self];
 	
+	[adium.menuController removeMenuItem:dockStatusMenuRoot];
+
 	accountMenu = nil;
 	statusMenu = nil;
+	dockStatusMenuRoot = nil;
+	currentMenuItemArray = nil;
+	installedMenuItems = nil;
+	socialNetworkingMenuItem = nil;
 }
 
 /*!