summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Sales de Andrade <qulogic@pidgin.im>2009-01-25 20:51:41 +0000
committerElliott Sales de Andrade <qulogic@pidgin.im>2009-01-25 20:51:41 +0000
commit0c50754c033be7836f4c98f1f0f1cc4bfea7eac3 (patch)
treed43ebed8452750006ea8cfdad859628482cd1c40
parentc012fe7410a53d24c919fee0dc67953d4df0ca32 (diff)
parent33b59838c24aef52e1a4267848fa59a0d1bb966c (diff)
downloadpidgin-0c50754c033be7836f4c98f1f0f1cc4bfea7eac3.tar.gz
merge of '3bec19909b15d5a996841297cbd1d02f689abb51'
and 'f6552db17721b75d37d1dec87be6a14a67ed0eab'
-rw-r--r--libpurple/protocols/msn/slpcall.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libpurple/protocols/msn/slpcall.c b/libpurple/protocols/msn/slpcall.c
index dbb09ab03a..70b28b2349 100644
--- a/libpurple/protocols/msn/slpcall.c
+++ b/libpurple/protocols/msn/slpcall.c
@@ -239,6 +239,10 @@ msn_slp_process_msg(MsnSlpLink *slplink, MsnSlpMessage *slpmsg)
msn_slpcall_session_init(slpcall);
}
#endif
+ else if (slpmsg->flags == 0x2)
+ {
+ /* Acknowledgement of previous message. Don't do anything currently. */
+ }
else
purple_debug_warning("msn", "Unprocessed SLP message with flags 0x%08lx\n",
slpmsg->flags);