Mercurial > pidgin.yaz

comparison libpurple/protocols/msn/notification.c @ 31344:ac9035aeb087

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove dead assignments in new MSN code.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Thu, 04 Nov 2010 04:41:48 +0000
parents 23be655cc688
children 2de522fa534a
comparison
equal deleted inserted replaced
31337:56e1f06471a9 31344:ac9035aeb087
93 connect_cb(MsnServConn *servconn) 93 connect_cb(MsnServConn *servconn)
94 { 94 {
95 MsnCmdProc *cmdproc; 95 MsnCmdProc *cmdproc;
96 MsnSession *session; 96 MsnSession *session;
97 MsnTransaction *trans; 97 MsnTransaction *trans;
98 PurpleAccount *account;
99 GString *vers; 98 GString *vers;
100 const char *ver_str; 99 const char *ver_str;
101 int i; 100 int i;
102 101
103 g_return_if_fail(servconn != NULL); 102 g_return_if_fail(servconn != NULL);
104 103
105 cmdproc = servconn->cmdproc; 104 cmdproc = servconn->cmdproc;
106 session = servconn->session; 105 session = servconn->session;
107 account = session->account;
108 106
109 vers = g_string_new(""); 107 vers = g_string_new("");
110 108
111 for (i = WLM_MAX_PROTOCOL; i >= WLM_MIN_PROTOCOL; i--) 109 for (i = WLM_MAX_PROTOCOL; i >= WLM_MIN_PROTOCOL; i--)
112 g_string_append_printf(vers, " MSNP%d", i); 110 g_string_append_printf(vers, " MSNP%d", i);
187 } 185 }
188 186
189 static void 187 static void
190 usr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) 188 usr_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
191 { 189 {
192 MsnSession *session; 190 MsnSession *session = cmdproc->session;
193 PurpleAccount *account;
194
195 session = cmdproc->session;
196 account = session->account;
197 191
198 if (!g_ascii_strcasecmp(cmd->params[1], "OK")) 192 if (!g_ascii_strcasecmp(cmd->params[1], "OK"))
199 { 193 {
200 /* authenticate OK */ 194 /* authenticate OK */
201 msn_session_set_login_step(session, MSN_LOGIN_STEP_SYN); 195 msn_session_set_login_step(session, MSN_LOGIN_STEP_SYN);
730 return; 724 return;
731 } 725 }
732 for (domain_node = xmlnode_get_child(root, "d"); 726 for (domain_node = xmlnode_get_child(root, "d");
733 domain_node; 727 domain_node;
734 domain_node = xmlnode_get_next_twin(domain_node)) { 728 domain_node = xmlnode_get_next_twin(domain_node)) {
735 const gchar * domain = NULL;
736 xmlnode *contact_node = NULL; 729 xmlnode *contact_node = NULL;
737
738 domain = xmlnode_get_attrib(domain_node, "n");
739 730
740 for (contact_node = xmlnode_get_child(domain_node, "c"); 731 for (contact_node = xmlnode_get_child(domain_node, "c");
741 contact_node; 732 contact_node;
742 contact_node = xmlnode_get_next_twin(contact_node)) { 733 contact_node = xmlnode_get_next_twin(contact_node)) {
743 const gchar *list; 734 const gchar *list;
1019 1010
1020 static void 1011 static void
1021 iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) 1012 iln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
1022 { 1013 {
1023 MsnSession *session; 1014 MsnSession *session;
1024 PurpleAccount *account;
1025 PurpleConnection *gc;
1026 MsnUser *user; 1015 MsnUser *user;
1027 MsnObject *msnobj = NULL; 1016 MsnObject *msnobj = NULL;
1028 unsigned long clientid, extcaps; 1017 unsigned long clientid, extcaps;
1029 char *extcap_str; 1018 char *extcap_str;
1030 int networkid = 0; 1019 int networkid = 0;
1031 const char *state, *passport; 1020 const char *state, *passport;
1032 char *friendly; 1021 char *friendly;
1033 1022
1034 session = cmdproc->session; 1023 session = cmdproc->session;
1035 account = session->account;
1036 gc = purple_account_get_connection(account);
1037 1024
1038 state = cmd->params[1]; 1025 state = cmd->params[1];
1039 passport = cmd->params[2]; 1026 passport = cmd->params[2];
1040 1027
1041 user = msn_userlist_find_user(session->userlist, passport); 1028 user = msn_userlist_find_user(session->userlist, passport);
1244 1231
1245 static void 1232 static void
1246 nln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) 1233 nln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
1247 { 1234 {
1248 MsnSession *session; 1235 MsnSession *session;
1249 PurpleAccount *account;
1250 PurpleConnection *gc;
1251 MsnUser *user; 1236 MsnUser *user;
1252 MsnObject *msnobj; 1237 MsnObject *msnobj;
1253 unsigned long clientid, extcaps; 1238 unsigned long clientid, extcaps;
1254 char *extcap_str; 1239 char *extcap_str;
1255 int networkid; 1240 int networkid;
1256 const char *state, *passport, *friendly; 1241 const char *state, *passport, *friendly;
1257 1242
1258 session = cmdproc->session; 1243 session = cmdproc->session;
1259 account = session->account;
1260 gc = purple_account_get_connection(account);
1261 1244
1262 state = cmd->params[0]; 1245 state = cmd->params[0];
1263 passport = cmd->params[1]; 1246 passport = cmd->params[1];
1264 networkid = atoi(cmd->params[2]); 1247 networkid = atoi(cmd->params[2]);
1265 friendly = purple_url_decode(cmd->params[3]); 1248 friendly = purple_url_decode(cmd->params[3]);
1453 port = 80; 1436 port = 80;
1454 1437
1455 swboard = msn_switchboard_new(session); 1438 swboard = msn_switchboard_new(session);
1456 1439
1457 msn_switchboard_set_invited(swboard, TRUE); 1440 msn_switchboard_set_invited(swboard, TRUE);
1458 msn_switchboard_set_session_id(swboard, cmd->params[0]); 1441 msn_switchboard_set_session_id(swboard, session_id);
1459 msn_switchboard_set_auth_key(swboard, cmd->params[3]); 1442 msn_switchboard_set_auth_key(swboard, cmd->params[3]);
1460 swboard->im_user = g_strdup(cmd->params[4]); 1443 swboard->im_user = g_strdup(cmd->params[4]);
1461 /* msn_switchboard_add_user(swboard, cmd->params[4]); */ 1444 /* msn_switchboard_add_user(swboard, cmd->params[4]); */
1462 1445
1463 if (!msn_switchboard_connect(swboard, host, port)) 1446 if (!msn_switchboard_connect(swboard, host, port))
1694 static void 1677 static void
1695 ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload, 1678 ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
1696 size_t len) 1679 size_t len)
1697 { 1680 {
1698 MsnSession *session; 1681 MsnSession *session;
1699 PurpleAccount *account;
1700 MsnUser *user; 1682 MsnUser *user;
1701 const char *passport; 1683 const char *passport;
1702 xmlnode *payloadNode; 1684 xmlnode *payloadNode;
1703 char *psm_str, *str; 1685 char *psm_str, *str;
1704 1686
1705 session = cmdproc->session; 1687 session = cmdproc->session;
1706 account = session->account;
1707 1688
1708 passport = cmd->params[0]; 1689 passport = cmd->params[0];
1709 if (g_str_equal(passport, session->user->passport)) 1690 if (g_str_equal(passport, session->user->passport))
1710 user = session->user; 1691 user = session->user;
1711 else 1692 else