pidgin.2.5.6: 895b62bf: Pluck the MSN bug fixes.
sadrul at pidgin.im
sadrul at pidgin.im
Wed Apr 29 14:36:35 EDT 2009
-----------------------------------------------------------------
Revision: 895b62bf62773603ba15e694316a3ef48c312187
Ancestor: 83340fde0be7982cbf3d7355bc5cea7c1d3fd716
Author: sadrul at pidgin.im
Date: 2009-04-29T18:24:34
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/895b62bf62773603ba15e694316a3ef48c312187
Modified files:
libpurple/protocols/msn/contact.c
libpurple/protocols/msn/contact.h
libpurple/protocols/msn/notification.c
ChangeLog:
Pluck the MSN bug fixes.
*** Plucked rev e3608f6f (qulogic at pidgin.im):
Ignore the Forward List status bit when checking if user is on the Allow
and Block lists at the same time.
References #6702.
*** Plucked rev 99d00e33 (qulogic at pidgin.im):
For federated buddies, we should set <Member>/<Type> to Email, and use an
<Email> node instead of <PassportName>. Along with that, we shouldn't set
any <Annotations> to specify it's a federated buddy either, since the MSN
server will complain about it.
Fixes #7939.
*** Plucked rev bf71505b (qulogic at pidgin.im):
Fix a faulty condition that would result in an attempt to add most of your
email-only contacts to your buddy and/or privacy list. This was temporary,
but resulted in a lot of extra traffic during login.
References #8579.
-------------- next part --------------
============================================================
--- libpurple/protocols/msn/contact.c 7ef3db2fa6f5dc428b73648a17aa5060f4c9ecad
+++ libpurple/protocols/msn/contact.c c3a440dbb8cbef444ea2b6e5986e259620ea63b6
@@ -697,25 +697,28 @@ msn_parse_addressbook_contacts(MsnSessio
/*TODO: need to support the Mobile type*/
continue;
}
- for (contactEmailNode = xmlnode_get_child(emailsNode, "ContactEmail"); contactEmailNode;
- contactEmailNode = xmlnode_get_next_twin(contactEmailNode)) {
- if (!(messengerEnabledNode = xmlnode_get_child(contactEmailNode, "isMessengerEnabled")))
- continue;
+ for (contactEmailNode = xmlnode_get_child(emailsNode, "ContactEmail");
+ contactEmailNode;
+ contactEmailNode = xmlnode_get_next_twin(contactEmailNode)) {
+ if ((messengerEnabledNode = xmlnode_get_child(contactEmailNode, "isMessengerEnabled"))) {
- msnEnabled = xmlnode_get_data(messengerEnabledNode);
+ msnEnabled = xmlnode_get_data(messengerEnabledNode);
- if (msnEnabled && !strcmp(msnEnabled, "true")) {
- if ((emailNode = xmlnode_get_child(contactEmailNode, "email")))
- passport = xmlnode_get_data(emailNode);
+ if (msnEnabled && !strcmp(msnEnabled, "true")) {
+ if ((emailNode = xmlnode_get_child(contactEmailNode, "email")))
+ passport = xmlnode_get_data(emailNode);
- /*Messenger enabled, Get the Passport*/
- purple_debug_info("msn", "AB Yahoo/Federated User %s\n", passport ? passport : "(null)");
+ /* Messenger enabled, Get the Passport*/
+ purple_debug_info("msn", "AB Yahoo/Federated User %s\n", passport ? passport : "(null)");
+ g_free(msnEnabled);
+ break;
+ }
+
g_free(msnEnabled);
- break;
}
-
- g_free(msnEnabled);
}
+ if (passport == NULL) /* Couldn't find anything */
+ continue;
} else {
xmlnode *messenger_user;
/* ignore non-messenger contacts */
@@ -1482,8 +1485,6 @@ msn_del_contact_from_list(MsnSession *se
const gchar *passport, const MsnListId list)
{
gchar *body = NULL, *member = NULL;
- const char *type = "PassportMember";
- gchar *federate = NULL;
MsnSoapPartnerScenario partner_scenario;
MsnUser *user;
@@ -1501,23 +1502,28 @@ msn_del_contact_from_list(MsnSession *se
msn_callback_state_set_who(state, passport);
user = msn_userlist_find_user(session->userlist, passport);
- if (user && user->networkid != MSN_NETWORK_PASSPORT) {
- type = "EmailMember";
- federate = g_strdup_printf(MSN_MEMBER_FEDERATED_ANNOTATION_XML,
- user->networkid);
- }
if (list == MSN_LIST_PL) {
partner_scenario = MSN_PS_CONTACT_API;
- member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML,
- type, user->membership_id[MSN_LIST_PL],
- federate ? federate : "");
+ if (user && user->networkid != MSN_NETWORK_PASSPORT)
+ member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML,
+ "EmailMember", "Email",
+ user->membership_id[MSN_LIST_PL]);
+ else
+ member = g_strdup_printf(MSN_MEMBER_MEMBERSHIPID_XML,
+ "PassportMember", "Passport",
+ user->membership_id[MSN_LIST_PL]);
} else {
/* list == MSN_LIST_AL || list == MSN_LIST_BL */
partner_scenario = MSN_PS_BLOCK_UNBLOCK;
- member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML,
- type, passport,
- federate ? federate : "");
+ if (user && user->networkid != MSN_NETWORK_PASSPORT)
+ member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML,
+ "EmailMember", "Email",
+ "Email", passport, "Email");
+ else
+ member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML,
+ "PassportMember", "Passport",
+ "PassportName", passport, "PassportName");
}
body = g_strdup_printf(MSN_CONTACT_DELETE_FROM_LIST_TEMPLATE,
@@ -1530,7 +1536,6 @@ msn_del_contact_from_list(MsnSession *se
state->cb = msn_del_contact_from_list_read_cb;
msn_contact_request(state);
- g_free(federate);
g_free(member);
g_free(body);
}
@@ -1578,8 +1583,6 @@ msn_add_contact_to_list(MsnSession *sess
const gchar *passport, const MsnListId list)
{
gchar *body = NULL, *member = NULL;
- const char *type = "PassportMember";
- gchar *federate = NULL;
MsnSoapPartnerScenario partner_scenario;
MsnUser *user;
@@ -1596,15 +1599,16 @@ msn_add_contact_to_list(MsnSession *sess
msn_callback_state_set_who(state, passport);
user = msn_userlist_find_user(session->userlist, passport);
- if (user && user->networkid != MSN_NETWORK_PASSPORT) {
- type = "EmailMember";
- federate = g_strdup_printf(MSN_MEMBER_FEDERATED_ANNOTATION_XML,
- user->networkid);
- }
partner_scenario = (list == MSN_LIST_RL) ? MSN_PS_CONTACT_API : MSN_PS_BLOCK_UNBLOCK;
- member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML,
- type, state->who, federate ? federate : "");
+ if (user && user->networkid != MSN_NETWORK_PASSPORT)
+ member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML,
+ "EmailMember", "Email",
+ "Email", state->who, "Email");
+ else
+ member = g_strdup_printf(MSN_MEMBER_PASSPORT_XML,
+ "PassportMember", "Passport",
+ "PassportName", state->who, "PassportName");
body = g_strdup_printf(MSN_CONTACT_ADD_TO_LIST_TEMPLATE,
MsnSoapPartnerScenarioText[partner_scenario],
@@ -1616,7 +1620,6 @@ msn_add_contact_to_list(MsnSession *sess
state->cb = msn_add_contact_to_list_read_cb;
msn_contact_request(state);
- g_free(federate);
g_free(member);
g_free(body);
}
============================================================
--- libpurple/protocols/msn/contact.h 7ab018e76d1d4a0d4638ebedbf4e890ad984bf72
+++ libpurple/protocols/msn/contact.h 7ca6d016c5474b5285f0e09719cd19665bee9bc7
@@ -397,28 +397,18 @@
#define MSN_MEMBER_PASSPORT_XML \
"<Member xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"%s\">"\
- "<Type>Passport</Type>"\
+ "<Type>%s</Type>"\
"<State>Accepted</State>"\
- "<PassportName>%s</PassportName>"\
- "%s"\
+ "<%s>%s</%s>"\
"</Member>"
#define MSN_MEMBER_MEMBERSHIPID_XML \
"<Member xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"%s\">"\
- "<Type>Passport</Type>"\
+ "<Type>%s</Type>"\
"<MembershipId>%u</MembershipId>"\
"<State>Accepted</State>"\
- "%s"\
"</Member>"
-#define MSN_MEMBER_FEDERATED_ANNOTATION_XML \
- "<Annotations>"\
- "<Annotation>"\
- "<Name>MSN.IM.BuddyType</Name>"\
- "<Value>%02d:</Value>"\
- "</Annotation>"\
- "</Annotations>"
-
/* first delete contact from allow list */
#define MSN_CONTACT_DELETE_FROM_LIST_TEMPLATE "<?xml version=\"1.0\" encoding=\"utf-8\"?>"\
============================================================
--- libpurple/protocols/msn/notification.c f6594ebbd8c27ba4a0f784df595b3e711d7842f3
+++ libpurple/protocols/msn/notification.c 758cb633aabbfe599da5ec637cb108b36a19c77f
@@ -665,13 +665,14 @@ msn_notification_dump_contact(MsnSession
if (user->passport && !strcmp(user->passport, "messenger at microsoft.com"))
continue;
- if ((user->list_op & MSN_LIST_OP_MASK) == (MSN_LIST_AL_OP | MSN_LIST_BL_OP)) {
+ if ((user->list_op & MSN_LIST_OP_MASK & ~MSN_LIST_FL_OP)
+ == (MSN_LIST_AL_OP | MSN_LIST_BL_OP)) {
/* The server will complain if we send it a user on both the
Allow and Block lists. So assume they're on the Block list
and remove them from the Allow list in the membership lists to
stop this from happening again. */
purple_debug_warning("msn",
- "User %s is on both Allow and Block list,"
+ "User %s is on both Allow and Block list; "
"removing from Allow list.\n",
user->passport);
msn_userlist_rem_buddy_from_list(session->userlist, user->passport, MSN_LIST_AL);
More information about the Commits
mailing list