adium 2539:2c9881ea8cdf: im.pidgin.adium at c46ba578108576be9927...
commits at adium.im
commits at adium.im
Thu Jul 16 00:29:01 UTC 2009
details: http://hg.adium.im/adium/rev/2c9881ea8cdf
revision: 2539:2c9881ea8cdf
author: Zachary West <zacw at adium.im>
date: Wed Jul 15 20:28:34 2009 -0400
im.pidgin.adium at c46ba578108576be9927a82636db9534587ce011, which also has pidgin-facebookchat at r261.
diffs (142 lines):
diff -r 08dbced50685 -r 2c9881ea8cdf Frameworks/libpurple.framework/Versions/0.6.0/Headers/contact.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/contact.h Mon Jul 13 21:47:43 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/contact.h Wed Jul 15 20:28:34 2009 -0400
@@ -232,6 +232,17 @@
"</contactInfo>"\
"</Contact>"
+#define MSN_CONTACT_INVITE_MESSAGE_XML \
+ "<MessengerMemberInfo>"\
+ "<PendingAnnotations>"\
+ "<Annotation>"\
+ "<Name>MSN.IM.InviteMessage</Name>"\
+ "<Value>%s</Value>"\
+ "</Annotation>"\
+ "</PendingAnnotations>"\
+ "<DisplayName>%s</DisplayName>"\
+ "</MessengerMemberInfo>"
+
#define MSN_ADD_CONTACT_TEMPLATE "<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
"<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\""\
" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""\
@@ -290,6 +301,7 @@
"<fGenerateMissingQuickName>true</fGenerateMissingQuickName>"\
"<EnableAllowListManagement>true</EnableAllowListManagement>"\
"</groupContactAddOptions>"\
+ "%s"\
"</ABGroupContactAdd>"\
"</soap:Body>"\
"</soap:Envelope>"
diff -r 08dbced50685 -r 2c9881ea8cdf Frameworks/libpurple.framework/Versions/0.6.0/Headers/oscar.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/oscar.h Mon Jul 13 21:47:43 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/oscar.h Wed Jul 15 20:28:34 2009 -0400
@@ -732,23 +732,27 @@
#define AIM_TRANSFER_DENY_DECLINE 0x0001
#define AIM_TRANSFER_DENY_NOTACCEPTING 0x0002
-#define AIM_IMPARAM_FLAG_CHANMSGS_ALLOWED 0x00000001
-#define AIM_IMPARAM_FLAG_MISSEDCALLS_ENABLED 0x00000002
-#define AIM_IMPARAM_FLAG_SUPPORT_OFFLINEMSGS 0x00000100
+#define AIM_IMPARAM_FLAG_CHANNEL_MSGS_ALLOWED 0x00000001
+#define AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED 0x00000002
+#define AIM_IMPARAM_FLAG_EVENTS_ALLOWED 0x00000008
+#define AIM_IMPARAM_FLAG_SMS_SUPPORTED 0x00000010
+#define AIM_IMPARAM_FLAG_OFFLINE_MSGS_ALLOWED 0x00000100
/* This is what the server will give you if you don't set them yourself. */
+/* This is probably out of date. */
#define AIM_IMPARAM_DEFAULTS { \
0, \
- AIM_IMPARAM_FLAG_CHANMSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSEDCALLS_ENABLED, \
+ AIM_IMPARAM_FLAG_CHANNEL_MSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED, \
512, /* !! Note how small this is. */ \
(99.9)*10, (99.9)*10, \
1000 /* !! And how large this is. */ \
}
/* This is what most AIM versions use. */
+/* This is probably out of date. */
#define AIM_IMPARAM_REASONABLE { \
0, \
- AIM_IMPARAM_FLAG_CHANMSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSEDCALLS_ENABLED, \
+ AIM_IMPARAM_FLAG_CHANNEL_MSGS_ALLOWED | AIM_IMPARAM_FLAG_MISSED_CALLS_ENABLED, \
8000, \
(99.9)*10, (99.9)*10, \
0 \
diff -r 08dbced50685 -r 2c9881ea8cdf Frameworks/libpurple.framework/Versions/0.6.0/Headers/prefs.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/prefs.h Mon Jul 13 21:47:43 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/prefs.h Wed Jul 15 20:28:34 2009 -0400
@@ -315,6 +315,15 @@
/**
* Add a callback to a pref (and its children)
+ *
+ * @param handle The handle of the receiver.
+ * @param name The name of the preference
+ * @param cb The callback function
+ * @param data The data to pass to the callback function.
+ *
+ * @return An id to disconnect the callback
+ *
+ * @see purple_prefs_disconnect_callback
*/
guint purple_prefs_connect_callback(void *handle, const char *name, PurplePrefCallback cb,
gpointer data);
diff -r 08dbced50685 -r 2c9881ea8cdf Frameworks/libpurple.framework/Versions/0.6.0/Headers/privacy.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/privacy.h Mon Jul 13 21:47:43 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/privacy.h Wed Jul 15 20:28:34 2009 -0400
@@ -26,8 +26,6 @@
#ifndef _PURPLE_PRIVACY_H_
#define _PURPLE_PRIVACY_H_
-#include "account.h"
-
/**
* Privacy data types.
*/
@@ -40,6 +38,8 @@
PURPLE_PRIVACY_ALLOW_BUDDYLIST
} PurplePrivacyType;
+#include "account.h"
+
#ifdef __cplusplus
extern "C" {
#endif
diff -r 08dbced50685 -r 2c9881ea8cdf Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_aliases.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_aliases.h Mon Jul 13 21:47:43 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_aliases.h Wed Jul 15 20:28:34 2009 -0400
@@ -36,5 +36,6 @@
void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias);
void yahoo_fetch_aliases(PurpleConnection *gc);
void yahoo_set_userinfo(PurpleConnection *gc);
-void yahoo_personal_details_reset(YahooPersonalDetails *ypd);
-
+void yahoo_set_userinfo_for_buddy(PurpleConnection *gc, PurpleBuddy *buddy);
+void yahoo_personal_details_reset(YahooPersonalDetails *ypd, gboolean all);
+void yahoo_process_contact_details(PurpleConnection *gc, struct yahoo_packet *pkt);
diff -r 08dbced50685 -r 2c9881ea8cdf Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_friend.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_friend.h Mon Jul 13 21:47:43 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_friend.h Wed Jul 15 20:28:34 2009 -0400
@@ -56,7 +56,7 @@
YahooPresenceVisibility presence;
int protocol; /* 1=LCS, 2=MSN*/
long int version_id;
- gchar *alias_id; /* XXX: stick in a YahooPersonalDetails instead? */
+ YahooPersonalDetails ypd;
YahooP2PStatus p2p_status;
gboolean p2p_packet_sent; /* 0:not sent, 1=sent */
gint session_id; /* session id of friend */
diff -r 08dbced50685 -r 2c9881ea8cdf Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_packet.h
--- a/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_packet.h Mon Jul 13 21:47:43 2009 -0400
+++ b/Frameworks/libpurple.framework/Versions/0.6.0/Headers/yahoo_packet.h Wed Jul 15 20:28:34 2009 -0400
@@ -98,6 +98,7 @@
YAHOO_SERVICE_AVATAR_UPDATE = 0xc7,
YAHOO_SERVICE_VERIFY_ID_EXISTS = 0xc8,
YAHOO_SERVICE_AUDIBLE = 0xd0,
+ YAHOO_SERVICE_CONTACT_DETAILS = 0xd3,
/* YAHOO_SERVICE_CHAT_SESSION = 0xd4,?? Reports start of chat session, gets an id from server */
YAHOO_SERVICE_AUTH_REQ_15 = 0xd6,
YAHOO_SERVICE_FILETRANS_15 = 0xdc,
diff -r 08dbced50685 -r 2c9881ea8cdf 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