pidgin: ff78de1f: Deleting a contact without a ContactId d...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: ff78de1f9fa6eee9a221b3b93a349720ec81314c
Ancestor: f4d83078205cbcd78ebb9a29464a66c8c97e5b7c
Author: qulogic at pidgin.im
Date: 2008-12-07T07:28:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ff78de1f9fa6eee9a221b3b93a349720ec81314c

Modified files:
        libpurple/protocols/msn/contact.c

ChangeLog: 

Deleting a contact without a ContactId doesn't work, so don't bother the server
with it.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/contact.c	360c16664efade450981b6b61027c0092d0d8b90
+++ libpurple/protocols/msn/contact.c	0c634d84db3e1fe84f29f0912d155a697445d06d
@@ -1179,8 +1179,8 @@ msn_delete_contact(MsnSession *session, 
 		contact_id_xml = g_strdup_printf(MSN_CONTACT_ID_XML, user->uid);
 		purple_debug_info("msn", "Deleting contact with contactId: %s\n", user->uid);
 	} else {
-		contact_id_xml = g_strdup_printf(MSN_CONTACT_XML, user->passport);
-		purple_debug_info("msn", "Deleting contact with passport: %s\n", user->passport);
+		purple_debug_info("msn", "Unable to delete contact %s without a ContactId\n", user->passport);
+		return;
 	}
 
 	state = msn_callback_state_new(session);