adium-1.4 3643:de5d40eec827: Fix connecting to Facebook by sendi...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/de5d40eec827
revision:	3643:de5d40eec827
branch:		(none)
author:		Robert Vehse
date:		Mon Oct 24 11:22:48 2011 +0200

Fix connecting to Facebook by sending the now encrypted OAuth token instead of the soon-to-be-deprecated session_key. References #15544.

diffs (69 lines):

diff -r e9272fee64fe -r de5d40eec827 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Sun Oct 23 01:21:25 2011 +0200
+++ b/ChangeLogs/Changes.txt	Mon Oct 24 11:22:48 2011 +0200
@@ -1,14 +1,14 @@
 				Adium Version History
 				-----------------------
-Version 1.4.4
- * Yahoo
-   * Fix avatars of contacts not updating correctly.
- * Gadu-Gadu
-   * Fix logging in on PPC Macs.
+Version 1.4.4 (X/X/X)
+ * Facebook: Fixed connectivity. (#15544)
+ * Yahoo: Fixed avatars of contacts not updating correctly.
+ * Gadu-Gadu: Fixed logging in on PPC Macs. (#15153)
 
   Contact List
    * Turned off rubber band scrolling for the contact list, as this looks bad when using a borderless window. (#15455)
 
+
 Version 1.4.3 (09/04/2011)
  * Fixed a security vulnerability related to file transfers.
  * libpurple:
@@ -30,6 +30,7 @@
  * Updated localisations: British English, Chinese (Traditional), Danish (#15431), Dutch (#15421), French (#15402), German (#15374), Greek (#15330), Italian (#15395), Norwegian (Bokmål) (#15365), Portuguese (Portugal) (#15371), Swedish (#15384).
  * Fixed a case of unfavourable wording in the German localisation. (#15393)
 
+
 Version 1.4.2 (06/13/2011)
  Updated to libpurple 2.7.11. Highlights of applicable changes:
   * MSN
diff -r e9272fee64fe -r de5d40eec827 Plugins/Purple Service/AIFacebookXMPPAccount.m
--- a/Plugins/Purple Service/AIFacebookXMPPAccount.m	Sun Oct 23 01:21:25 2011 +0200
+++ b/Plugins/Purple Service/AIFacebookXMPPAccount.m	Mon Oct 24 11:22:48 2011 +0200
@@ -411,7 +411,7 @@
 														  error:NULL];
 	 */
 	
-	NSString *sessionKey = [[[self oAuthToken] componentsSeparatedByString:@"|"] objectAtIndex:1];
+	NSString *sessionKey = [self oAuthToken];
 	[[adium accountController] setPassword:sessionKey forAccount:self];
 
 	/* When we're newly authorized, connect! */
diff -r e9272fee64fe -r de5d40eec827 Plugins/Purple Service/libpurple_extensions/auth_fb.c
--- a/Plugins/Purple Service/libpurple_extensions/auth_fb.c	Sun Oct 23 01:21:25 2011 +0200
+++ b/Plugins/Purple Service/libpurple_extensions/auth_fb.c	Mon Oct 24 11:22:48 2011 +0200
@@ -105,7 +105,7 @@
 	request = purple_fbapi_construct_request(purple_connection_get_account(js->gc),
 											 method,
 											 "v", "1.0",
-											 "session_key", purple_connection_get_password(js->gc),
+											 "access_token", purple_connection_get_password(js->gc),
 											 "nonce", nonce,
 											 NULL);
 	g_free(method);
diff -r e9272fee64fe -r de5d40eec827 Plugins/Purple Service/libpurple_extensions/fbapi.c
--- a/Plugins/Purple Service/libpurple_extensions/fbapi.c	Sun Oct 23 01:21:25 2011 +0200
+++ b/Plugins/Purple Service/libpurple_extensions/fbapi.c	Mon Oct 24 11:22:48 2011 +0200
@@ -262,8 +262,8 @@
 		value = va_arg(args, const char *);
 		g_tree_insert(params, (char *)key, (char *)value);
 
-		/* If we have a session_key then we need a call_id */
-		if (g_str_equal(key, "session_key")) {
+		/* If we have an access_token then we need a call_id */
+		if (g_str_equal(key, "access_token")) {
 			struct timeval tv;
 			if (gettimeofday(&tv, NULL) != 0) {
 				time_t now;