adium 2250:9da0b118ce57: im.pidgin.adium at c427f364517fb319669c...

commits at adium.im commits at adium.im
Wed May 20 04:49:03 UTC 2009


details:	http://hg.adium.im/adium/rev/9da0b118ce57
revision:	2250:9da0b118ce57
author:		Zachary West <zacw at adium.im>
date:		Wed May 20 00:48:42 2009 -0400

im.pidgin.adium at c427f364517fb319669c32208d5611dff2494ec2.

A bunch of changes since 1.4b1's copy, such as Yahoo! 16 login, and fixes an issue with ping timeouts. Fixes #12124.

diffstat:

 Frameworks/libpurple.framework/Versions/0.6.0/Headers/iq.h           |   5 ++
 Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h       |   2 +
 Frameworks/libpurple.framework/Versions/0.6.0/Headers/prpl.h         |   6 +-
 Frameworks/libpurple.framework/Versions/0.6.0/Headers/user.h         |  19 +++++++++
 Frameworks/libpurple.framework/Versions/0.6.0/Headers/userlist.h     |   5 --
 Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo.h        |  16 +++++--
 Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_packet.h |   4 +-
 Frameworks/libpurple.framework/Versions/0.6.0/libpurple              |     
 8 files changed, 42 insertions(+), 15 deletions(-)

diffs (168 lines):

diff -r 4e4e0005bbc2 -r 9da0b118ce57 Frameworks/libpurple.framework/Versions/0.6.0/Headers/iq.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/iq.h	Wed May 20 00:39:33 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/iq.h	Wed May 20 00:48:42 2009 -0400
@@ -31,6 +31,7 @@
 } JabberIqType;
 
 #include "jabber.h"
+#include "connection.h"
 
 typedef struct _JabberIq JabberIq;
 
@@ -106,4 +107,8 @@
 void jabber_iq_register_handler(const char *node, const char *xmlns,
                                 JabberIqHandler *func);
 
+/* Connected to namespace-handler registration signals */
+void jabber_iq_signal_register(const gchar *node, const gchar *xmlns);
+void jabber_iq_signal_unregister(const gchar *node, const gchar *xmlns);
+
 #endif /* PURPLE_JABBER_IQ_H_ */
diff -r 4e4e0005bbc2 -r 9da0b118ce57 Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h	Wed May 20 00:39:33 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/jabber.h	Wed May 20 00:48:42 2009 -0400
@@ -75,6 +75,8 @@
 /* Index into attention_types list */
 #define JABBER_BUZZ 0
 
+extern PurplePlugin *jabber_plugin;
+
 typedef enum {
 	JABBER_STREAM_OFFLINE,
 	JABBER_STREAM_CONNECTING,
diff -r 4e4e0005bbc2 -r 9da0b118ce57 Frameworks/libpurple.framework/Versions/0.6.0/Headers/prpl.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/prpl.h	Wed May 20 00:39:33 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/prpl.h	Wed May 20 00:48:42 2009 -0400
@@ -126,10 +126,10 @@
 typedef enum
 {
 	/**
-	 * Use a unique name, not an alias, for chat rooms.
+	 * User names are unique to a chat and are not shared between rooms.
 	 *
-	 * XMPP lets you choose what name you want for chat.
-	 * So it shouldn't be pulling the alias for when you're in chat;
+	 * XMPP lets you choose what name you want in chats, so it shouldn't
+	 * be pulling the aliases from the buddy list for the chat list;
 	 * it gets annoying.
 	 */
 	OPT_PROTO_UNIQUE_CHATNAME = 0x00000004,
diff -r 4e4e0005bbc2 -r 9da0b118ce57 Frameworks/libpurple.framework/Versions/0.6.0/Headers/user.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/user.h	Wed May 20 00:39:33 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/user.h	Wed May 20 00:48:42 2009 -0400
@@ -105,6 +105,8 @@
 
 	guint membership_id[5];	/**< The membershipId sent by the contacts server,
 				     indexed by the list it belongs to		*/
+
+	char *invite_message;   /**< Invite message of user request */
 };
 
 /**************************************************************************
@@ -290,6 +292,14 @@
  */
 void msn_user_set_client_caps(MsnUser *user, GHashTable *info);
 
+/**
+ * Sets the invite message for a user.
+ *
+ * @param user    The user.
+ * @param message The invite message for a user.
+ */
+void msn_user_set_invite_message(MsnUser *user, const char *message);
+
 
 /**
  * Returns the passport account for a user.
@@ -373,6 +383,15 @@
 GHashTable *msn_user_get_client_caps(const MsnUser *user);
 
 /**
+ * Returns the invite message for a user.
+ *
+ * @param user The user.
+ *
+ * @return The user's invite message.
+ */
+const char *msn_user_get_invite_message(const MsnUser *user);
+
+/**
  * check to see if user is online
  */
 gboolean
diff -r 4e4e0005bbc2 -r 9da0b118ce57 Frameworks/libpurple.framework/Versions/0.6.0/Headers/userlist.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/userlist.h	Wed May 20 00:39:33 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/userlist.h	Wed May 20 00:48:42 2009 -0400
@@ -57,12 +57,7 @@
 
 gboolean msn_userlist_user_is_in_group(MsnUser *user, const char * group_id);
 gboolean msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id);
-MsnListId msn_get_list_id(const char *list);
 
-void msn_got_add_user(MsnSession *session, MsnUser *user,
-					  MsnListId list_id, const char *group_id);
-void msn_got_rem_user(MsnSession *session, MsnUser *user,
-					  MsnListId list_id, const char *group_id);
 void msn_got_lst_user(MsnSession *session, MsnUser *user,
 					  int list_op, GSList *group_ids);
 
diff -r 4e4e0005bbc2 -r 9da0b118ce57 Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo.h	Wed May 20 00:39:33 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo.h	Wed May 20 00:48:42 2009 -0400
@@ -31,10 +31,12 @@
 #define YAHOO_PAGER_HOST "scs.msg.yahoo.com"
 #define YAHOO_PAGER_PORT 5050
 #define YAHOO_PAGER_PORT_P2P 5101
+#define YAHOO_LOGIN_URL "https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=&token=%s"
+#define YAHOO_TOKEN_URL "https://login.yahoo.com/config/pwtoken_get?src=ymsgr&ts=&login=%s&passwd=%s&chal=%s"
 #define YAHOO_P2P_KEEPALIVE_SECS 300
 #define YAHOO_P2P_SERVER_TIMEOUT 10
 #define YAHOO_PROFILE_URL "http://profiles.yahoo.com/"
-#define YAHOO_MAIL_URL "https://login.yahoo.com/config/login?.src=ym"
+#define YAHOO_MAIL_URL "http://rd.yahoo.com/messenger/client/?http://mail.yahoo.com/"
 #define YAHOO_XFER_HOST "filetransfer.msg.yahoo.com"
 #define YAHOO_XFER_PORT 80
 #define YAHOO_XFER_RELAY_HOST "relay.msg.yahoo.com"
@@ -44,6 +46,8 @@
 /* really we should get the list of servers from
  http://update.messenger.yahoo.co.jp/servers.html */
 #define YAHOOJP_PAGER_HOST "cs.yahoo.co.jp"
+#define YAHOOJP_TOKEN_URL "https://login.yahoo.co.jp/config/pwtoken_get?src=ymsgr&ts=&login=%s&passwd=%s&chal=%s"
+#define YAHOOJP_LOGIN_URL "https://login.yahoo.co.jp/config/pwtoken_login?src=ymsgr&ts=&token=%s"
 #define YAHOOJP_PROFILE_URL "http://profiles.yahoo.co.jp/"
 #define YAHOOJP_MAIL_URL "http://mail.yahoo.co.jp/"
 #define YAHOOJP_XFER_HOST "filetransfer.msg.yahoo.co.jp"
@@ -79,11 +83,13 @@
 #define YAHOO_STATUS_TYPE_INVISIBLE "invisible"
 #define YAHOO_STATUS_TYPE_MOBILE "mobile"
 
-#define YAHOO_CLIENT_VERSION_ID "2097087"
-#define YAHOO_CLIENT_VERSION "8.1.0.421"
+#define YAHOO_CLIENT_VERSION_ID "4194239"
+#define YAHOO_CLIENT_VERSION "9.0.0.2152"
 
-#define YAHOOJP_CLIENT_VERSION_ID "524223"
-#define YAHOOJP_CLIENT_VERSION "7,0,1,1"
+#define YAHOOJP_CLIENT_VERSION_ID "4194239"
+#define YAHOOJP_CLIENT_VERSION "9.0.0.2152"
+
+#define YAHOO_CLIENT_USERAGENT "Mozilla/4.0 (compatible; MSIE 5.5)"
 
 /* Index into attention types list. */
 #define YAHOO_BUZZ 0
diff -r 4e4e0005bbc2 -r 9da0b118ce57 Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_packet.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_packet.h	Wed May 20 00:39:33 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_packet.h	Wed May 20 00:48:42 2009 -0400
@@ -125,8 +125,8 @@
 };
 
 #define YAHOO_WEBMESSENGER_PROTO_VER 0x0065
-#define YAHOO_PROTO_VER 0x000f
-#define YAHOO_PROTO_VER_JAPAN 0x000f
+#define YAHOO_PROTO_VER 0x0010
+#define YAHOO_PROTO_VER_JAPAN 0x0010
 
 #define YAHOO_PACKET_HDRLEN (4 + 2 + 2 + 2 + 2 + 4 + 4)
 
diff -r 4e4e0005bbc2 -r 9da0b118ce57 Frameworks/libpurple.framework/Versions/0.6.0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.6.0/libpurple has changed




More information about the commits mailing list