Mercurial > pidgin.yaz

comparison libpurple/protocols/msn/notification.c @ 30695:3ff6c193efee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The session parameter appears unused in msn_add_contact_xml.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 17 Jul 2010 20:13:29 +0000
parents bb6e71f7be93
children 88a047f92c39
comparison
equal deleted inserted replaced
30694:62ca462d0abc 30695:3ff6c193efee
407 gpointer data; 407 gpointer data;
408 } MsnFqyCbData; 408 } MsnFqyCbData;
409 409
410 /* add contact to xmlnode */ 410 /* add contact to xmlnode */
411 static void 411 static void
412 msn_add_contact_xml(MsnSession *session, xmlnode *mlNode,const char *passport, MsnListOp list_op, MsnNetwork networkId) 412 msn_add_contact_xml(xmlnode *mlNode, const char *passport, MsnListOp list_op, MsnNetwork networkId)
413 { 413 {
414 xmlnode *d_node,*c_node; 414 xmlnode *d_node,*c_node;
415 char **tokens; 415 char **tokens;
416 const char *email,*domain; 416 const char *email,*domain;
417 char fmt_str[3]; 417 char fmt_str[3];
541 541
542 msn_user_set_network(user, network); 542 msn_user_set_network(user, network);
543 543
544 adl_node = xmlnode_new("ml"); 544 adl_node = xmlnode_new("ml");
545 xmlnode_set_attrib(adl_node, "l", "1"); 545 xmlnode_set_attrib(adl_node, "l", "1");
546 msn_add_contact_xml(session, adl_node, passport, 546 msn_add_contact_xml(adl_node, passport,
547 user->list_op & MSN_LIST_OP_MASK, network); 547 user->list_op & MSN_LIST_OP_MASK, network);
548 payload = xmlnode_to_str(adl_node, &payload_len); 548 payload = xmlnode_to_str(adl_node, &payload_len);
549 msn_notification_post_adl(session->notification->cmdproc, payload, payload_len); 549 msn_notification_post_adl(session->notification->cmdproc, payload, payload_len);
550 g_free(payload); 550 g_free(payload);
551 } else { 551 } else {
552 purple_debug_error("msn", 552 purple_debug_error("msn",
598 user->passport); 598 user->passport);
599 msn_user_unset_op(user, MSN_LIST_AL_OP); 599 msn_user_unset_op(user, MSN_LIST_AL_OP);
600 } 600 }
601 601
602 if (user->networkid != MSN_NETWORK_UNKNOWN) { 602 if (user->networkid != MSN_NETWORK_UNKNOWN) {
603 msn_add_contact_xml(session, adl_node, user->passport, 603 msn_add_contact_xml(adl_node, user->passport,
604 user->list_op & MSN_LIST_OP_MASK, user->networkid); 604 user->list_op & MSN_LIST_OP_MASK,
605 user->networkid);
605 606
606 /* each ADL command may contain up to 150 contacts */ 607 /* each ADL command may contain up to 150 contacts */
607 if (++adl_count % 150 == 0) { 608 if (++adl_count % 150 == 0) {
608 payload = xmlnode_to_str(adl_node, &payload_len); 609 payload = xmlnode_to_str(adl_node, &payload_len);
609 610
628 session->adl_fqy++; 629 session->adl_fqy++;
629 if (purple_debug_is_verbose()) 630 if (purple_debug_is_verbose())
630 purple_debug_info("msn", "Adding FQY address, count is %d\n", 631 purple_debug_info("msn", "Adding FQY address, count is %d\n",
631 session->adl_fqy); 632 session->adl_fqy);
632 633
633 msn_add_contact_xml(session, fqy_node, user->passport, 634 msn_add_contact_xml(fqy_node, user->passport, 0, user->networkid);
634 0, user->networkid);
635 635
636 /* each FQY command may contain up to 150 contacts, probably */ 636 /* each FQY command may contain up to 150 contacts, probably */
637 if (++fqy_count % 150 == 0) { 637 if (++fqy_count % 150 == 0) {
638 payload = xmlnode_to_str(fqy_node, &payload_len); 638 payload = xmlnode_to_str(fqy_node, &payload_len);
639 639
1954 msn_user_set_network(addrem->user, network); 1954 msn_user_set_network(addrem->user, network);
1955 1955
1956 node = xmlnode_new("ml"); 1956 node = xmlnode_new("ml");
1957 node->child = NULL; 1957 node->child = NULL;
1958 1958
1959 msn_add_contact_xml(session, node, passport, 1959 msn_add_contact_xml(node, passport, addrem->list_op, network);
1960 addrem->list_op, network);
1961 1960
1962 payload = xmlnode_to_str(node, &payload_len); 1961 payload = xmlnode_to_str(node, &payload_len);
1963 xmlnode_free(node); 1962 xmlnode_free(node);
1964 1963
1965 if (addrem->add) 1964 if (addrem->add)
1985 cmdproc = notification->servconn->cmdproc; 1984 cmdproc = notification->servconn->cmdproc;
1986 1985
1987 adl_node = xmlnode_new("ml"); 1986 adl_node = xmlnode_new("ml");
1988 adl_node->child = NULL; 1987 adl_node->child = NULL;
1989 1988
1990 msn_add_contact_xml(notification->session, adl_node, user->passport, 1989 msn_add_contact_xml(adl_node, user->passport, list_op, user->networkid);
1991 list_op, user->networkid);
1992 1990
1993 payload = xmlnode_to_str(adl_node, &payload_len); 1991 payload = xmlnode_to_str(adl_node, &payload_len);
1994 xmlnode_free(adl_node); 1992 xmlnode_free(adl_node);
1995 1993
1996 if (user->networkid != MSN_NETWORK_UNKNOWN) { 1994 if (user->networkid != MSN_NETWORK_UNKNOWN) {
2024 cmdproc = notification->servconn->cmdproc; 2022 cmdproc = notification->servconn->cmdproc;
2025 2023
2026 rml_node = xmlnode_new("ml"); 2024 rml_node = xmlnode_new("ml");
2027 rml_node->child = NULL; 2025 rml_node->child = NULL;
2028 2026
2029 msn_add_contact_xml(notification->session, rml_node, user->passport, 2027 msn_add_contact_xml(rml_node, user->passport, list_op, user->networkid);
2030 list_op, user->networkid);
2031 2028
2032 payload = xmlnode_to_str(rml_node, &payload_len); 2029 payload = xmlnode_to_str(rml_node, &payload_len);
2033 xmlnode_free(rml_node); 2030 xmlnode_free(rml_node);
2034 2031
2035 if (user->networkid != MSN_NETWORK_UNKNOWN) { 2032 if (user->networkid != MSN_NETWORK_UNKNOWN) {