pidgin: libpurple/protocols/msn/contact.c comparison

comparison libpurple/protocols/msn/contact.c @ 20671:4dd60add6a7c

Further cleanup of the msn prpl including preventing the authorization request callback from crashing if triggered after the account is disconnected. Also removal of some extraneous debuggery, there is more that needs to be removed.

author	Daniel Atallah <daniel.atallah@gmail.com>
date	Fri, 28 Sep 2007 01:57:55 +0000
parents	0e1bc5c51030
children	48ee7ec3426d 8e53c75bb87c

comparison

equal deleted inserted replaced

-:6b9e964f0572
+:4dd60add6a7c
 					MsnUser *user = NULL;
 					xmlnode *typeNode, *membershipIdNode = NULL;
 					gchar *type, *membershipId = NULL;
 					const char *member_type = xmlnode_get_attrib(member, "type");
-					purple_debug_info("MSNCL","Member type: %s\n", member_type ? member_type : "(null)");
+					if (!member_type) {
+						purple_debug_error("msn", "No Member Type specified for Member.\n");
-					if (!member_type)
 						continue;
+					}
 					if(!g_strcasecmp(member_type, "PassportMember") ) {
 						passport = type = NULL;
 						if ((passportNode = xmlnode_get_child(member, "PassportName")))
 							passport = xmlnode_get_data(passportNode);
 						}
 						msn_got_lst_user(session, user, list_op, NULL);
 					}
 					else if (!g_strcasecmp(member_type, "PhoneMember")) {
+						purple_debug_info("msn", "Recieved Phone Member; ignoring.\n");
 					}
 					else if (!g_strcasecmp(member_type, "EmailMember")) {
 						xmlnode *emailNode;
 						passport = NULL;
 								g_free(membershipId);
 							}
 						}
 						msn_got_lst_user(session, user, list_op, NULL);
+					} else {
+						purple_debug_info("msn", "Unknown Member type: %s\n", member_type);
 					}
 				}
 			}
 			g_free(typedata);	/* Free 'Type' node data after processing 'Messenger' Service */
 		}
 /* SOAP  get contact list*/
 void
 msn_get_contact_list(MsnContact * contact, const MsnSoapPartnerScenario partner_scenario, const char *update_time)
 {
 	MsnSoapReq *soap_request;
-	gchar *body = NULL;
+	gchar *body;
-	gchar * update_str;
+	gchar *update_str = NULL;
 	const gchar *partner_scenario_str = MsnSoapPartnerScenarioText[partner_scenario];
 	purple_debug_misc("MSNCL","Getting Contact List.\n");
 	if ( update_time != NULL ) {
 		purple_debug_info("MSNCL","Last update time: %s\n",update_time);
 		update_str = g_strdup_printf(MSN_GET_CONTACT_UPDATE_XML,update_time);
-	} else {
+	}
-		update_str = g_strdup("");
-	}
+	body = g_strdup_printf(MSN_GET_CONTACT_TEMPLATE, partner_scenario_str, update_str ? update_str : "");
-	body = g_strdup_printf(MSN_GET_CONTACT_TEMPLATE, partner_scenario_str, update_str);
 	g_free(update_str);
 	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
 					MSN_GET_CONTACT_POST_URL,
 					MSN_GET_CONTACT_SOAP_ACTION,
 	purple_debug_info("MsnAb","msn_parse_addressbook_groups()\n");
 	for(group = xmlnode_get_child(node, "Group"); group;
 					group = xmlnode_get_next_twin(group)){
 		xmlnode *groupId, *groupInfo, *groupname;
-		char *group_id, *group_name;
+		char *group_id = NULL, *group_name = NULL;
-		groupId = xmlnode_get_child(group,"groupId");
+		if ((groupId = xmlnode_get_child(group, "groupId")))
-		group_id = xmlnode_get_data(groupId);
+			group_id = xmlnode_get_data(groupId);
-		groupInfo = xmlnode_get_child(group,"groupInfo");
+		if ((groupInfo = xmlnode_get_child(group, "groupInfo")) && (groupname = xmlnode_get_child(groupInfo, "name")))
-		groupname = xmlnode_get_child(groupInfo,"name");
+			group_name = xmlnode_get_data(groupname);
-		group_name = xmlnode_get_data(groupname);
 		msn_group_new(session->userlist, group_id, group_name);
 		if (group_id == NULL){
 			/* Group of ungroupped buddies */
 			g_free(group_name);
 			continue;
 		}
-		purple_debug_info("MsnAB","group_id: %s, name: %s\n",group_id,group_name);
+		purple_debug_info("MsnAB","group_id: %s, name: %s\n", group_id, group_name ? group_name : "(null)");
 		if ((purple_find_group(group_name)) == NULL){
 			PurpleGroup *g = purple_group_new(group_name);
 			purple_blist_add_group(g, NULL);
 		}
 		g_free(group_id);
 		user = msn_userlist_find_add_user(session->userlist, passport, Name);
 		msn_user_set_uid(user, uid);
 		msn_user_set_type(user, usertype);
-		purple_debug_misc("MsnAB","parse guid...\n");
 		groupIds = xmlnode_get_child(contactInfo, "groupIds");
 		if (groupIds) {
 			for (guid = xmlnode_get_child(groupIds, "guid"); guid;
 							guid = xmlnode_get_next_twin(guid)){
 				char *group_id = xmlnode_get_data(guid);
 				msn_user_add_group_id(user, group_id);
 				purple_debug_misc("MsnAB", "guid:%s\n", group_id ? group_id : "(null)");
 				g_free(group_id);
 			}
 		} else {
+			purple_debug_info("msn", "User not in any groups, adding to default group.\n");
 			/*not in any group,Then set default group*/
 			msn_user_add_group_id(user, MSN_INDIVIDUALS_GROUP_ID);
 		}
 		msn_got_lst_user(session, user, MSN_LIST_FL_OP, NULL);
 }
 static gboolean
 msn_parse_addressbook(MsnContact * contact)
 {
-	MsnSession * session;
+	MsnSession *session;
 	xmlnode * node,*body,*response,*result;
 	xmlnode *groups;
-	xmlnode	*contacts;
+	xmlnode *contacts;
 	xmlnode *abNode;
 	xmlnode *fault, *faultstringnode, *faultdetail, *errorcode;
 	session = contact->session;
 	node = xmlnode_from_str(contact->soapconn->body, contact->soapconn->body_len);
 	if ( node == NULL ) {
 		purple_debug_error("MSN AddressBook","Error parsing Address Book with size %d\n", contact->soapconn->body_len);
 		return FALSE;
 	}
 	purple_debug_misc("MSN AddressBook", "Parsing Address Book with size %d\n", contact->soapconn->body_len);
-	purple_debug_misc("MSN AddressBook","node{%p},name:%s,child:%s,last:%s\n",node,node->name,node->child->name,node->lastchild->name);
+	purple_debug_misc("MSN AddressBook","node{%p},name:%s,child:%s,last:%s\n", node,
+		node->name ? node->name : "(null)",
+		(node->child && node->child->name) ? node->child->name : "(null)",
+		(node->lastchild && node->lastchild->name) ? node->lastchild->name : "(null)");
 	body = xmlnode_get_child(node,"Body");
 	purple_debug_misc("MSN AddressBook","body{%p},name:%s\n",body,body->name);
 	/* TODO: This appears to be used in a number of places and should be de-duplicated */
 	if ( (fault = xmlnode_get_child(body, "Fault")) != NULL) {
 void
 msn_update_contact(MsnContact *contact, const char* nickname)
 {
 	MsnSoapReq *soap_request;
-	gchar *body = NULL, *escaped_nickname;
+	gchar *body, *escaped_nickname;
+	/* I'm not sure this is right, but if it isn't, the rest of this function will need to be fixed */
+	g_return_if_fail(nickname != NULL);
 	purple_debug_info("MSN CL","Update contact information with new friendly name: %s\n", nickname);
 	escaped_nickname = g_markup_escape_text(nickname, -1);
 	body = g_strdup_printf(MSN_CONTACT_UPDATE_TEMPLATE, escaped_nickname);
 	g_free(escaped_nickname);
 	/*build SOAP and POST it*/
 	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
 					MSN_ADDRESS_BOOK_POST_URL,
 					MSN_CONTACT_UPDATE_SOAP_ACTION,

Mercurial > pidgin

comparison libpurple/protocols/msn/contact.c @ 20671:4dd60add6a7c