adium 2489:56d91bf40dd8: im.pidgin.adium at 5047e7147b3c9ae124f9...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/56d91bf40dd8
revision:	2489:56d91bf40dd8
author:		Zachary West <zacw at adium.im>
date:		Fri Jun 12 17:35:27 2009 -0400

im.pidgin.adium at 5047e7147b3c9ae124f94a3be8128d3938923d1b

diffs (144 lines):

diff -r f0c0cee909b9 -r 56d91bf40dd8 Frameworks/libpurple.framework/Versions/0.6.0/Headers/buddy.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/buddy.h	Thu Jun 11 16:56:29 2009 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/buddy.h	Fri Jun 12 17:35:27 2009 -0400
@@ -123,4 +123,8 @@
 										const gchar *cap);
 gboolean jabber_buddy_has_capability(const JabberBuddy *jb, const gchar *cap);
 
+const gchar *
+jabber_resource_get_identity_category_type(const JabberBuddyResource *jbr,
+	const gchar *category);
+
 #endif /* PURPLE_JABBER_BUDDY_H_ */
diff -r f0c0cee909b9 -r 56d91bf40dd8 Frameworks/libpurple.framework/Versions/0.6.0/Headers/buddylist.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/buddylist.h	Thu Jun 11 16:56:29 2009 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/buddylist.h	Fri Jun 12 17:35:27 2009 -0400
@@ -31,7 +31,7 @@
 ggp_buddylist_send(PurpleConnection *gc);
 
 /**
- * Load buddylist from server into the rooster.
+ * Load buddylist from server into the roster.
  *
  * @param gc PurpleConnection
  * @param buddylist Pointer to the buddylist that will be loaded.
@@ -41,14 +41,6 @@
 ggp_buddylist_load(PurpleConnection *gc, char *buddylist);
 
 /**
- * Set offline status for all buddies.
- *
- * @param gc Connection handler
- */
-void
-ggp_buddylist_offline(PurpleConnection *gc);
-
-/**
  * Get all the buddies in the current account.
  *
  * @param account Current account.
diff -r f0c0cee909b9 -r 56d91bf40dd8 Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h	Thu Jun 11 16:56:29 2009 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h	Fri Jun 12 17:35:27 2009 -0400
@@ -44,6 +44,8 @@
 	JABBER_CAP_ADHOC		  = 1 << 12,
 	JABBER_CAP_BLOCKING       = 1 << 13,
 
+	JABBER_CAP_ITEMS          = 1 << 14,
+
 	JABBER_CAP_RETRIEVED      = 1 << 31
 } JabberCapabilities;
 
@@ -53,12 +55,12 @@
 #include <glib.h>
 #include "circbuffer.h"
 #include "connection.h"
+#include "dnsquery.h"
 #include "dnssrv.h"
 #include "media.h"
 #include "mediamanager.h"
 #include "roomlist.h"
 #include "sslconn.h"
-#include "dnsquery.h"
 
 #include "iq.h"
 #include "jutil.h"
@@ -153,7 +155,6 @@
 	GList *user_directories;
 
 	GHashTable *iq_callbacks;
-	GHashTable *disco_callbacks;
 	int next_id;
 
 	GList *bs_proxies;
@@ -244,7 +245,7 @@
 	char *certificate_CN;
 
 	/* A purple timeout tag for the keepalive */
-	int keepalive_timeout;
+	guint keepalive_timeout;
 
 	PurpleSrvResponse *srv_rec;
 	guint srv_rec_idx;
@@ -301,6 +302,8 @@
 void jabber_process_packet(JabberStream *js, xmlnode **packet);
 void jabber_send(JabberStream *js, xmlnode *data);
 void jabber_send_raw(JabberStream *js, const char *data, int len);
+void jabber_send_signal_cb(PurpleConnection *pc, xmlnode **packet,
+                           gpointer unused);
 
 void jabber_stream_set_state(JabberStream *js, JabberStreamState state);
 
@@ -366,6 +369,7 @@
 GList *jabber_actions(PurplePlugin *plugin, gpointer context);
 
 gboolean jabber_audio_enabled(JabberStream *js, const char *unused);
+gboolean jabber_video_enabled(JabberStream *js, const char *unused);
 gboolean jabber_initiate_media(PurpleAccount *account, const char *who,
 		PurpleMediaSessionType type);
 PurpleMediaCaps jabber_get_media_caps(PurpleAccount *account, const char *who);
diff -r f0c0cee909b9 -r 56d91bf40dd8 Frameworks/libpurple.framework/Versions/0.6.0/Headers/notification.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/notification.h	Thu Jun 11 16:56:29 2009 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/notification.h	Fri Jun 12 17:35:27 2009 -0400
@@ -58,7 +58,7 @@
 	gboolean in_use;
 };
 
-typedef void (*MsnFqyCb)(MsnSession *session, const char *passport, MsnNetwork network);
+typedef void (*MsnFqyCb)(MsnSession *session, const char *passport, MsnNetwork network, gpointer data);
 
 #include "state.h"
 void uum_send_msg(MsnSession *session,MsnMessage *msg);
@@ -73,7 +73,7 @@
 
 void msn_notification_send_fqy(MsnSession *session,
                                const char *payload, int payload_len,
-                               MsnFqyCb cb);
+                               MsnFqyCb cb, gpointer cb_data);
 
 MsnNotification *msn_notification_new(MsnSession *session);
 void msn_notification_destroy(MsnNotification *notification);
diff -r f0c0cee909b9 -r 56d91bf40dd8 Frameworks/libpurple.framework/Versions/0.6.0/Headers/userlist.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/userlist.h	Thu Jun 11 16:56:29 2009 -0700
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/userlist.h	Fri Jun 12 17:35:27 2009 -0400
@@ -47,7 +47,6 @@
 
 	GList *users; /* Contains MsnUsers */
 	GList *groups; /* Contains MsnGroups */
-	GList *pending; /* MsnUsers pending addition (waiting for FQY response) */
 
 	GQueue *buddy_icon_requests;
 	int buddy_icon_window;
@@ -87,12 +86,6 @@
 void msn_userlist_rem_buddy(MsnUserList *userlist, const char *who);
 void msn_userlist_add_buddy(MsnUserList *userlist,
 			    const char *who, const char *group_name);
-void msn_userlist_save_pending_buddy(MsnUserList *userlist,
-                                     const char *who,
-                                     const char *group_name);
-void msn_userlist_add_pending_buddy(MsnSession *session,
-                                    const char *who,
-                                    /*MsnNetwork*/ int network);
 void msn_userlist_move_buddy(MsnUserList *userlist, const char *who,
 						    const char *old_group_name,
 						    const char *new_group_name);