Mercurial > pidgin

comparison libpurple/protocols/msn/slpcall.c @ 30855:6814678f3c63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove session_id from SlpMsg and use the one from the header.
author masca@cpw.pidgin.im
date Wed, 21 Jul 2010 19:59:38 +0000
parents 7b1b7a4e0bb4
children 16ab805406d1
comparison
equal deleted inserted replaced
30854:47b6eda87723 30855:6814678f3c63
1064 1064
1065 if (slpmsg->flags == P2P_NO_FLAG || slpmsg->flags == P2P_WML2009_COMP) 1065 if (slpmsg->flags == P2P_NO_FLAG || slpmsg->flags == P2P_WML2009_COMP)
1066 { 1066 {
1067 char *body_str; 1067 char *body_str;
1068 1068
1069 if (slpmsg->session_id == 64) 1069 if (slpmsg->header->session_id == 64)
1070 { 1070 {
1071 /* This is for handwritten messages (Ink) */ 1071 /* This is for handwritten messages (Ink) */
1072 GError *error = NULL; 1072 GError *error = NULL;
1073 gsize bytes_read, bytes_written; 1073 gsize bytes_read, bytes_written;
1074 1074
1125 } 1125 }
1126 else if (slpmsg->flags == P2P_MSN_OBJ_DATA || 1126 else if (slpmsg->flags == P2P_MSN_OBJ_DATA ||
1127 slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) || 1127 slpmsg->flags == (P2P_WML2009_COMP | P2P_MSN_OBJ_DATA) ||
1128 slpmsg->flags == P2P_FILE_DATA) 1128 slpmsg->flags == P2P_FILE_DATA)
1129 { 1129 {
1130 slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->session_id); 1130 slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->header->session_id);
1131 1131
1132 if (slpcall != NULL) 1132 if (slpcall != NULL)
1133 { 1133 {
1134 if (slpcall->timer) { 1134 if (slpcall->timer) {
1135 purple_timeout_remove(slpcall->timer); 1135 purple_timeout_remove(slpcall->timer);