adium-1.3 393:71dbe4459f74: 1.3.6-debug makefile

commits at adium.im commits at adium.im
Tue Jan 12 02:04:35 UTC 2010


details:	http://hg.adium.im/adium-1.3/rev/71dbe4459f74
revision:	393:71dbe4459f74
author:		adium at smew.adiumx.com
date:		Mon Aug 31 08:06:21 2009 -0400

1.3.6-debug makefile
Subject: adium-1.3 394:0acaeb310be5: Version up to 1.3.9.

details:	http://hg.adium.im/adium-1.3/rev/0acaeb310be5
revision:	394:0acaeb310be5
author:		Smew
date:		Mon Jan 11 21:00:24 2010 -0500

Version up to 1.3.9.
Subject: adium-1.3 395:aee810b1c8d7: Some merge because someone didn't push or something.

details:	http://hg.adium.im/adium-1.3/rev/aee810b1c8d7
revision:	395:aee810b1c8d7
author:		Smew
date:		Mon Jan 11 21:03:50 2010 -0500

Some merge because someone didn't push or something.

diffs (118 lines):

diff -r 49b07c7ad3af -r aee810b1c8d7 .hgtags
--- a/.hgtags	Thu Aug 20 09:32:50 2009 -0500
+++ b/.hgtags	Mon Jan 11 21:03:50 2010 -0500
@@ -5,3 +5,4 @@
 8d7ab9d0f61469ff61876cd35c9cb0a9e89b4b60 1.3.4
 708bedafdc3ae16edc5b8bf6f249852c22224d5e 1.3.5
 feaca9408befdd4db4772a0c8906b63a319d0b72 1.3.6
+a76981b42330e449e5b6580ddc818df0f4443b26 1.3.7
diff -r 49b07c7ad3af -r aee810b1c8d7 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Thu Aug 20 09:32:50 2009 -0500
+++ b/ChangeLogs/Changes.txt	Mon Jan 11 21:03:50 2010 -0500
@@ -1,5 +1,16 @@
 				Adium Version History
 				-----------------------
+Version 1.3.8 (11/04/2009)
+ * Updated pidgin-facebook chat, fixing login.
+ * Corrected the Events preferences not displaying the correct list on Snow Leopard.
+
+Version 1.3.7 (10/16/2009)
+ * Updated libpurple
+   * Fix a crash when some clients send contacts in a format we don't understand on ICQ.
+   * Fix blocking and other privacy lists on AIM/ICQ. 
+   * Fixed CAPTCHA not working properly on Facebook. 
+ * Fixed iChat emoticons on Snow Leopard.
+
 Version 1.3.6 (8/18/2009)
  * Updated to libpurple 2.5.9
 	* Fix a crash via a specially crafted MSN message (CVE-2009-2694).
diff -r 49b07c7ad3af -r aee810b1c8d7 Frameworks/Adium Framework/Source/ESContactAlertsViewController.m
--- a/Frameworks/Adium Framework/Source/ESContactAlertsViewController.m	Thu Aug 20 09:32:50 2009 -0500
+++ b/Frameworks/Adium Framework/Source/ESContactAlertsViewController.m	Mon Jan 11 21:03:50 2010 -0500
@@ -497,7 +497,7 @@
 			[contactAlertsEvents addObject:eventID];
 			
 			//XXX
-			[contactAlertsActions addObject:[NSArray array]];
+			[contactAlertsActions addObject:[NSMutableArray array]];
 		}
 	}
 
diff -r 49b07c7ad3af -r aee810b1c8d7 Frameworks/libpurple.framework/Versions/0.5.9/Headers/oscar.h
--- a/Frameworks/libpurple.framework/Versions/0.5.9/Headers/oscar.h	Thu Aug 20 09:32:50 2009 -0500
+++ b/Frameworks/libpurple.framework/Versions/0.5.9/Headers/oscar.h	Mon Jan 11 21:03:50 2010 -0500
@@ -530,6 +530,10 @@
 		struct userinfo_node *requested;
 	} locate;
 
+	struct {
+		gboolean have_rights;
+	} bos;
+
 	/* Server-stored information (ssi) */
 	struct {
 		gboolean received_data;
diff -r 49b07c7ad3af -r aee810b1c8d7 Frameworks/libpurple.framework/Versions/0.5.9/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.5.9/libpurple has changed
diff -r 49b07c7ad3af -r aee810b1c8d7 Plists/Info.plist
--- a/Plists/Info.plist	Thu Aug 20 09:32:50 2009 -0500
+++ b/Plists/Info.plist	Mon Jan 11 21:03:50 2010 -0500
@@ -330,7 +330,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Adium</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.3.6, Copyright 2001-2009 The Adium Team</string>
+	<string>1.3.8, Copyright 2001-2009 The Adium Team</string>
 	<key>CFBundleHelpBookFolder</key>
 	<string>AdiumHelp</string>
 	<key>CFBundleHelpBookName</key>
@@ -346,7 +346,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.6</string>
+	<string>1.3.8</string>
 	<key>CFBundleSignature</key>
 	<string>AdIM</string>
 	<key>CFBundleURLTypes</key>
@@ -415,7 +415,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.6</string>
+	<string>1.3.8</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.4.0</string>
 	<key>LSRequiresNativeExecution</key>
diff -r 49b07c7ad3af -r aee810b1c8d7 Release/Makefile
--- a/Release/Makefile	Thu Aug 20 09:32:50 2009 -0500
+++ b/Release/Makefile	Mon Jan 11 21:03:50 2010 -0500
@@ -17,7 +17,7 @@
 # - make all
 ###########
 
-VERSION=1.3.6
+VERSION=1.3.9
 BUILD_IN_DEBUG_MODE?=FALSE
 BETA?=FALSE
 OFFICIAL_BUILD?=TRUE
diff -r 49b07c7ad3af -r aee810b1c8d7 Release/mkalias
Binary file Release/mkalias has changed
diff -r 49b07c7ad3af -r aee810b1c8d7 Resources/Emoticons/iChat.AdiumEmoticonset/Emoticons.plist
--- a/Resources/Emoticons/iChat.AdiumEmoticonset/Emoticons.plist	Thu Aug 20 09:32:50 2009 -0500
+++ b/Resources/Emoticons/iChat.AdiumEmoticonset/Emoticons.plist	Mon Jan 11 21:03:50 2010 -0500
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>AdiumSetVersion</key>
@@ -9,6 +9,7 @@
 	<key>Location</key>
 	<array>
 		<string>/System/Library/PrivateFrameworks/InstantMessage.framework/Versions/A/Resources</string>
+		<string>com.apple.iChat////Contents/Plugins/Standard.smileypack/Contents/Resources</string>
 		<string>com.apple.iChat////Contents/Resources</string>
 	</array>
 	<key>Emoticons</key>




More information about the commits mailing list