Mercurial > pidgin
diff libpurple/protocols/msn/slpcall.c @ 30870:d9ca3798faa5
Get rid of the Flags field in the SlpMessage in favor of the one in the Header.
author | masca@cpw.pidgin.im |
---|---|
date | Fri, 06 Aug 2010 00:07:39 +0000 |
parents | 5964f65c17ed |
children | c209701a3152 |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slpcall.c Thu Aug 05 23:58:21 2010 +0000 +++ b/libpurple/protocols/msn/slpcall.c Fri Aug 06 00:07:39 2010 +0000 @@ -1062,7 +1062,7 @@ body = slpmsg->buffer; body_len = slpmsg->header->offset; - if (slpmsg->flags == P2P_NO_FLAG || slpmsg->flags == P2P_WML2009_COMP) + if (slpmsg->header->flags == P2P_NO_FLAG || slpmsg->header->flags == P2P_WML2009_COMP) { char *body_str; @@ -1123,7 +1123,7 @@ } g_free(body_str); } - else if (msn_p2p_msg_is_data(slpmsg->flags)) + else if (msn_p2p_msg_is_data(slpmsg->header->flags)) { slpcall = msn_slplink_find_slp_call_with_session_id(slplink, slpmsg->header->session_id); @@ -1141,7 +1141,7 @@ } } #if 0 - else if (slpmsg->flags == 0x100) + else if (slpmsg->header->flags == 0x100) { slpcall = slplink->directconn->initial_call; @@ -1149,13 +1149,13 @@ msn_slpcall_session_init(slpcall); } #endif - else if (slpmsg->flags == P2P_ACK) + else if (slpmsg->header->flags == P2P_ACK) { /* Acknowledgement of previous message. Don't do anything currently. */ } else purple_debug_warning("msn", "Unprocessed SLP message with flags 0x%08lx\n", - slpmsg->flags); + slpmsg->header->flags); return slpcall; }