adium 2408:a8a7569079c7: warnings--

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/a8a7569079c7
revision:	2408:a8a7569079c7
author:		Zachary West <zacw at adium.im>
date:		Sat May 30 11:53:10 2009 -0400

warnings--
Subject: adium 2409:9dd3426c669b: im.pidgin.adium at 588f7d1b621540280 which fixes Yahoo! behind proxies.

details:	http://hg.adium.im/adium/rev/9dd3426c669b
revision:	2409:9dd3426c669b
author:		Zachary West <zacw at adium.im>
date:		Sat May 30 12:13:20 2009 -0400

im.pidgin.adium at 588f7d1b621540280 which fixes Yahoo! behind proxies.
Subject: adium 2410:1e7772b50f13: Disable Zephyr, since it just crashes.

details:	http://hg.adium.im/adium/rev/1e7772b50f13
revision:	2410:1e7772b50f13
author:		Zachary West <zacw at adium.im>
date:		Sat May 30 12:13:39 2009 -0400

Disable Zephyr, since it just crashes.

diffs (62 lines):

diff -r 4a8924478c80 -r 1e7772b50f13 Frameworks/libpurple.framework/Versions/0.6.0/Headers/util.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/util.h	Fri May 29 17:03:32 2009 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/util.h	Sat May 30 12:13:39 2009 -0400
@@ -1106,9 +1106,33 @@
  * @param max_len    The maximum number of bytes to retrieve (-1 for unlimited)
  * @param callback   The callback function.
  * @param data       The user data to pass to the callback function.
+ * @deprecated       In 3.0.0, this will go away.
+ */
+PurpleUtilFetchUrlData *purple_util_fetch_url_request_len(const gchar *url,
+		gboolean full, const gchar *user_agent, gboolean http11,
+		const gchar *request, gboolean include_headers, gssize max_len,
+		PurpleUtilFetchUrlCallback callback, gpointer data);
+
+/**
+ * Fetches the data from a URL, and passes it to a callback function.
+ *
+ * @param account    The account for which the request is needed, or NULL.
+ * @param url        The URL.
+ * @param full       TRUE if this is the full URL, or FALSE if it's a
+ *                   partial URL.
+ * @param user_agent The user agent field to use, or NULL.
+ * @param http11     TRUE if HTTP/1.1 should be used to download the file.
+ * @param request    A HTTP request to send to the server instead of the
+ *                   standard GET
+ * @param include_headers
+ *                   If TRUE, include the HTTP headers in the response.
+ * @param max_len    The maximum number of bytes to retrieve (-1 for unlimited)
+ * @param callback   The callback function.
+ * @param data       The user data to pass to the callback function.
  * @deprecated       In 3.0.0, we'll rename this to "purple_util_fetch_url_request" and get rid of the old one
  */
-PurpleUtilFetchUrlData *purple_util_fetch_url_request_len(const gchar *url,
+PurpleUtilFetchUrlData *purple_util_fetch_url_request_len_with_account(
+		PurpleAccount *account, const gchar *url,
 		gboolean full, const gchar *user_agent, gboolean http11,
 		const gchar *request, gboolean include_headers, gssize max_len,
 		PurpleUtilFetchUrlCallback callback, gpointer data);
diff -r 4a8924478c80 -r 1e7772b50f13 Frameworks/libpurple.framework/Versions/0.6.0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.6.0/libpurple has changed
diff -r 4a8924478c80 -r 1e7772b50f13 Plugins/Purple Service/CBPurpleServicePlugin.m
--- a/Plugins/Purple Service/CBPurpleServicePlugin.m	Fri May 29 17:03:32 2009 -0700
+++ b/Plugins/Purple Service/CBPurpleServicePlugin.m	Sat May 30 12:13:39 2009 -0400
@@ -55,7 +55,7 @@
 	[ESJabberService registerService];
 	[ESYahooService registerService];
 	[ESYahooJapanService registerService];	
-	[ESZephyrService registerService];
+	//[ESZephyrService registerService];
 	[ESMeanwhileService registerService];
 	
 	[SLPurpleCocoaAdapter pluginDidLoad];
diff -r 4a8924478c80 -r 1e7772b50f13 Source/AIObjectDebug.h
--- a/Source/AIObjectDebug.h	Fri May 29 17:03:32 2009 -0700
+++ b/Source/AIObjectDebug.h	Sat May 30 12:13:39 2009 -0400
@@ -10,4 +10,4 @@
 @interface NSObject (AIObjectDebug) 
 - (void) doesNotRecognizeSelector:(SEL)aSelector;
 @end
-#endif
\ No newline at end of file
+#endif