Mercurial > ~mikael > mcabber > hg
comparison mcabber/mcabber/xmpp.c @ 1728:15b3834cbe5f
Handle priority changes when the contact status doesn't change
Priority change wasn't recorded when the contact' status and status message
were not modified...
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Sun, 28 Feb 2010 14:15:38 +0100 |
parents | b18142457ca9 |
children | e6e89b1d7831 |
comparison
equal
deleted
inserted
replaced
1727:15e6b21df606 | 1728:15b3834cbe5f |
---|---|
1399 // Call hk_statuschange() if status has changed or if the | 1399 // Call hk_statuschange() if status has changed or if the |
1400 // status message is different | 1400 // status message is different |
1401 const char *msg; | 1401 const char *msg; |
1402 msg = roster_getstatusmsg(r, rname); | 1402 msg = roster_getstatusmsg(r, rname); |
1403 if ((ust != roster_getstatus(r, rname)) || | 1403 if ((ust != roster_getstatus(r, rname)) || |
1404 (!ustmsg && msg && msg[0]) || (ustmsg && (!msg || strcmp(ustmsg, msg)))) | 1404 (!ustmsg && msg && msg[0]) || |
1405 (ustmsg && (!msg || strcmp(ustmsg, msg))) || | |
1406 (bpprio != roster_getprio(r, rname))) | |
1405 hk_statuschange(r, rname, bpprio, timestamp, ust, ustmsg); | 1407 hk_statuschange(r, rname, bpprio, timestamp, ust, ustmsg); |
1406 // Presence signature processing | 1408 // Presence signature processing |
1407 if (!ustmsg) | 1409 if (!ustmsg) |
1408 ustmsg = ""; // Some clients omit the <status/> element :-( | 1410 ustmsg = ""; // Some clients omit the <status/> element :-( |
1409 check_signature(r, rname, lm_message_node_find_xmlns(m->node, NS_SIGNED), | 1411 check_signature(r, rname, lm_message_node_find_xmlns(m->node, NS_SIGNED), |