adium 2279:5c0f96f647c6: im.pidgin.adium at 064b7f3d1c27f2281afa...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/5c0f96f647c6
revision:	2279:5c0f96f647c6
author:		Zachary West <zacw at adium.im>
date:		Sat May 23 14:37:22 2009 -0400

im.pidgin.adium at 064b7f3d1c27f2281afa9d9bc9a29656ec85cf9b. This fixes up a few of our Jabber issues and AIM mail checking.

Fixes #11974. Refs #12053.

diffstat:

 Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h  |  4 ++--
 Frameworks/libpurple.framework/Versions/0.6.0/Headers/jutil.h   |  6 ++++++
 Frameworks/libpurple.framework/Versions/0.6.0/Headers/signals.h |  2 ++
 Frameworks/libpurple.framework/Versions/0.6.0/libpurple         |    
 4 files changed, 10 insertions(+), 2 deletions(-)

diffs (51 lines):

diff -r 6fc6badcb366 -r 5c0f96f647c6 Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h	Sat May 23 13:55:51 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h	Sat May 23 14:37:22 2009 -0400
@@ -245,7 +245,7 @@
 
 	/* A purple timeout tag for the keepalive */
 	int keepalive_timeout;
-	
+
 	PurpleSrvResponse *srv_rec;
 	guint srv_rec_idx;
 	guint max_srv_rec_idx;
@@ -322,7 +322,7 @@
 void jabber_add_feature(const gchar *namespace, JabberFeatureEnabled cb); /* cb may be NULL */
 void jabber_remove_feature(const gchar *namespace);
 
-/** Adds an identitiy to this jabber library instance. For list of valid values vistit the 
+/** Adds an identitiy to this jabber library instance. For list of valid values vistit the
  *	webiste of the XMPP Registrar ( http://www.xmpp.org/registrar/disco-categories.html#client ).
  *  @param category the category of the identity.
  *  @param type the type of the identity.
diff -r 6fc6badcb366 -r 5c0f96f647c6 Frameworks/libpurple.framework/Versions/0.6.0/Headers/jutil.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jutil.h	Sat May 23 13:55:51 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jutil.h	Sat May 23 14:37:22 2009 -0400
@@ -36,6 +36,12 @@
 
 const char *jabber_normalize(const PurpleAccount *account, const char *in);
 
+/* Returns true if JID is the bare JID of our server. */
+gboolean jabber_is_own_server(JabberStream *js, const char *jid);
+
+/* Returns true if JID is the bare JID of our account. */
+gboolean jabber_is_own_account(JabberStream *js, const char *jid);
+
 gboolean jabber_nodeprep_validate(const char *);
 gboolean jabber_nameprep_validate(const char *);
 gboolean jabber_resourceprep_validate(const char *);
diff -r 6fc6badcb366 -r 5c0f96f647c6 Frameworks/libpurple.framework/Versions/0.6.0/Headers/signals.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/signals.h	Sat May 23 13:55:51 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/signals.h	Sat May 23 14:37:22 2009 -0400
@@ -349,6 +349,8 @@
 		PurpleCallback cb, va_list args, void *data, void **return_val);
 void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_UINT(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
+void purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER(
+		PurpleCallback cb, va_list args, void *data, void **return_val);
 
 void purple_marshal_BOOLEAN__INT_POINTER(
 		PurpleCallback cb, va_list args, void *data, void **return_val);
diff -r 6fc6badcb366 -r 5c0f96f647c6 Frameworks/libpurple.framework/Versions/0.6.0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.6.0/libpurple has changed