adium 2490:3ea385a6b702: im.pidgin.adium at 5047e7147b3c9ae124f9...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/3ea385a6b702
revision:	2490:3ea385a6b702
author:		Zachary West <zacw at adium.im>
date:		Fri Jun 12 17:46:55 2009 -0400

im.pidgin.adium at 5047e7147b3c9ae124f94a3be8128d3938923d1b, now with more binary action.

diffs (107 lines):

diff -r 56d91bf40dd8 -r 3ea385a6b702 Frameworks/libpurple.framework/Versions/0.6.0/Headers/core.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/core.h	Fri Jun 12 17:35:27 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/core.h	Fri Jun 12 17:46:55 2009 -0400
@@ -186,6 +186,10 @@
  *
  *   <dt><tt>dev_website</tt></dt>
  *   <dd>the UI's development/support website, such as http://developer.pidgin.im.</dd>
+ *
+ *   <dt><tt>client_type</tt></dt>
+ *   <dd>the type of UI (pc, console, phone, handheld, web, bot)</dd>
+ *   
  * </dl>
  *
  * @return A GHashTable with strings for keys and values.  This
diff -r 56d91bf40dd8 -r 3ea385a6b702 Frameworks/libpurple.framework/Versions/0.6.0/Headers/proxy.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/proxy.h	Fri Jun 12 17:35:27 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/proxy.h	Fri Jun 12 17:46:55 2009 -0400
@@ -257,6 +257,35 @@
 			PurpleProxyConnectFunction connect_cb, gpointer data);
 
 /**
+ * Makes a connection to the specified host and port.  Note that this
+ * function name can be misleading--although it is called "proxy
+ * connect," it is used for establishing any outgoing UDP connection,
+ * whether through a proxy or not.
+ *
+ * @param handle     A handle that should be associated with this
+ *                   connection attempt.  The handle can be used
+ *                   to cancel the connection attempt using the
+ *                   purple_proxy_connect_cancel_with_handle()
+ *                   function.
+ * @param account    The account making the connection.
+ * @param host       The destination host.
+ * @param port       The destination port.
+ * @param connect_cb The function to call when the connection is
+ *                   established.  If the connection failed then
+ *                   fd will be -1 and error message will be set
+ *                   to something descriptive (hopefully).
+ * @param data       User-defined data.
+ *
+ * @return NULL if there was an error, or a reference to an
+ *         opaque data structure that can be used to cancel
+ *         the pending connection, if needed.
+ */
+PurpleProxyConnectData *purple_proxy_connect_udp(void *handle,
+			PurpleAccount *account,
+			const char *host, int port,
+			PurpleProxyConnectFunction connect_cb, gpointer data);
+
+/**
  * Makes a connection through a SOCKS5 proxy.
  *
  * @param handle     A handle that should be associated with this
diff -r 56d91bf40dd8 -r 3ea385a6b702 Frameworks/libpurple.framework/Versions/0.6.0/Headers/util.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/util.h	Fri Jun 12 17:35:27 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/util.h	Fri Jun 12 17:46:55 2009 -0400
@@ -506,8 +506,6 @@
  *
  * @return The text with HTML entities literalized.  You must g_free
  *         this string when finished with it.
- *
- * @see purple_escape_html
  */
 char *purple_unescape_html(const char *html);
 
@@ -581,6 +579,16 @@
  */
 char * purple_markup_get_css_property(const gchar *style, const gchar *opt);
 
+/**
+ * Check if the given HTML contains RTL text.
+ *
+ * @param html  The HTML text.
+ *
+ * @return  TRUE if the text contains RTL text, FALSE otherwise.
+ *
+ * @since 2.6.0
+ */
+gboolean purple_markup_is_rtl(const char *html);
 
 /*@}*/
 
@@ -1240,6 +1248,22 @@
 gchar *purple_utf8_salvage(const char *str);
 
 /**
+ * Removes unprintable characters from a UTF-8 string. These characters
+ * (in particular low-ASCII characters) are invalid in XML 1.0 and thus
+ * are not allowed in XMPP and are rejected by libxml2 by default. This
+ * function uses g_unichar_isprint to determine what characters should
+ * be stripped. The returned string must be freed by the caller.
+ *
+ * @param str A valid UTF-8 string.
+ *
+ * @return A newly allocated UTF-8 string without the unprintable characters.
+ * @since 2.6.0
+ *
+ * @see g_unichar_isprint
+ */
+gchar *purple_utf8_strip_unprintables(const gchar *str);
+
+/**
  * Return the UTF-8 version of gai_strerror().  It calls gai_strerror()
  * then converts the result to UTF-8.  This function is analogous to
  * g_strerror().
diff -r 56d91bf40dd8 -r 3ea385a6b702 Frameworks/libpurple.framework/Versions/0.6.0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.6.0/libpurple has changed