adium 2151:ff7dc80dc373: im.pidgin.adium at e54ac9b75dfdac4c65aa...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/ff7dc80dc373
revision:	2151:ff7dc80dc373
author:		Zachary West <zacw at adium.im>
date:		Mon May 11 01:52:26 2009 -0400

im.pidgin.adium at e54ac9b75dfdac4c65aaefa60edbc7de0fe3f654

diffstat:

 Frameworks/libpurple.framework/Versions/0.6.0/Headers/blist.h  |   5 ++-
 Frameworks/libpurple.framework/Versions/0.6.0/Headers/buddy.h  |   1 +
 Frameworks/libpurple.framework/Versions/0.6.0/Headers/caps.h   |  18 ++++++++-
 Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h |   1 +
 Frameworks/libpurple.framework/Versions/0.6.0/Headers/si.h     |   2 +-
 Frameworks/libpurple.framework/Versions/0.6.0/Headers/util.h   |   5 ++-
 Frameworks/libpurple.framework/Versions/0.6.0/libpurple        |     
 7 files changed, 27 insertions(+), 5 deletions(-)

diffs (125 lines):

diff -r 0c20c8365af1 -r ff7dc80dc373 Frameworks/libpurple.framework/Versions/0.6.0/Headers/blist.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/blist.h	Mon May 11 01:28:15 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/blist.h	Mon May 11 01:52:26 2009 -0400
@@ -260,11 +260,14 @@
 PurpleBlistNode *purple_blist_get_root(void);
 
 /**
- * Returns a list of every buddy in the list.
+ * Returns a list of every buddy in the list.  Use of this function is
+ * discouraged if you do not actually need every buddy in the list.  Use
+ * purple_find_buddies instead.
  *
  * @return A list of every buddy in the list. Caller is responsible for
  *         freeing the list.
  *
+ * @see purple_find_buddies
  * @since 2.6.0
  */
 GSList *purple_blist_get_buddies(void);
diff -r 0c20c8365af1 -r ff7dc80dc373 Frameworks/libpurple.framework/Versions/0.6.0/Headers/buddy.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/buddy.h	Mon May 11 01:28:15 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/buddy.h	Mon May 11 01:52:26 2009 -0400
@@ -86,6 +86,7 @@
 		GList *exts;
 	} caps;
 	GList *commands;
+	gboolean commands_fetched;
 } JabberBuddyResource;
 
 void jabber_buddy_free(JabberBuddy *jb);
diff -r 0c20c8365af1 -r ff7dc80dc373 Frameworks/libpurple.framework/Versions/0.6.0/Headers/caps.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/caps.h	Mon May 11 01:28:15 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/caps.h	Mon May 11 01:52:26 2009 -0400
@@ -30,11 +30,19 @@
 
 typedef struct _JabberCapsNodeExts JabberCapsNodeExts;
 
+typedef struct _JabberCapsTuple {
+	const char *node;
+	const char *ver;
+	const char *hash;
+} JabberCapsTuple;
+
 struct _JabberCapsClientInfo {
 	GList *identities; /* JabberIdentity */
 	GList *features; /* char * */
 	GList *forms; /* xmlnode * */
 	JabberCapsNodeExts *exts;
+
+	const JabberCapsTuple tuple;
 };
 
 /*
@@ -60,7 +68,10 @@
 void jabber_caps_init(void);
 void jabber_caps_uninit(void);
 
-void jabber_caps_destroy_key(gpointer value);
+/**
+ * Check whether all of the exts in a char* array are known to the given info.
+ */
+gboolean jabber_caps_exts_known(const JabberCapsClientInfo *info, char **exts);
 
 /**
  * Main entity capabilites function to get the capabilities of a contact.
@@ -68,10 +79,13 @@
  * The callback will be called synchronously if we already have the
  * capabilities for the specified (node,ver,hash) (and, if exts are specified,
  * if we know what each means)
+ *
+ * @param exts A g_strsplit'd (NULL-terminated) array of strings. This
+ *             function is responsible for freeing it.
  */
 void jabber_caps_get_info(JabberStream *js, const char *who, const char *node,
                           const char *ver, const char *hash,
-                          const char *ext, jabber_caps_get_info_cb cb,
+                          char **exts, jabber_caps_get_info_cb cb,
                           gpointer user_data);
 
 /**
diff -r 0c20c8365af1 -r ff7dc80dc373 Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h	Mon May 11 01:28:15 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h	Mon May 11 01:52:26 2009 -0400
@@ -366,6 +366,7 @@
 PurpleMediaCaps jabber_get_media_caps(PurpleAccount *account, const char *who);
 
 void jabber_register_commands(void);
+void jabber_unregister_commands(void);
 
 void jabber_init_plugin(PurplePlugin *plugin);
 void jabber_uninit_plugin(void);
diff -r 0c20c8365af1 -r ff7dc80dc373 Frameworks/libpurple.framework/Versions/0.6.0/Headers/si.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/si.h	Mon May 11 01:28:15 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/si.h	Mon May 11 01:52:26 2009 -0400
@@ -1,5 +1,5 @@
 /**
- * @file jutil.h utility functions
+ * @file si.h SI transfer functions
  *
  * purple
  *
diff -r 0c20c8365af1 -r ff7dc80dc373 Frameworks/libpurple.framework/Versions/0.6.0/Headers/util.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/util.h	Mon May 11 01:28:15 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/util.h	Mon May 11 01:52:26 2009 -0400
@@ -496,7 +496,8 @@
 char *purple_markup_linkify(const char *str);
 
 /**
- * Unescapes HTML entities to their literal characters.
+ * Unescapes HTML entities to their literal characters. Also translates
+ * "<br>" to "\n".
  * For example "&" is replaced by '&' and so on.
  * Actually only "&", """, "<" and ">" are currently
  * supported.
@@ -505,6 +506,8 @@
  *
  * @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);
 
diff -r 0c20c8365af1 -r ff7dc80dc373 Frameworks/libpurple.framework/Versions/0.6.0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.6.0/libpurple has changed