devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Tidied muc module

Browse Source
This commit is contained in:
James Booth
2014-09-28 22:09:20 +01:00
parent 41b49cb5d6
commit d25d6b4502
16 changed files with 186 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/xmpp/stanza.c
View File

@@ -851,19 +851,19 @@ stanza_is_muc_self_presence(xmpp_stanza_t * const stanza,
char *from = xmpp_stanza_get_attribute(stanza, STANZA_ATTR_FROM);
if (from) {
Jid *from_jid = jid_create(from);
if (muc_room_is_active(from_jid->barejid)) {
char *nick = muc_get_room_nick(from_jid->barejid);
if (muc_active(from_jid->barejid)) {
char *nick = muc_nick(from_jid->barejid);
if (g_strcmp0(from_jid->resourcepart, nick) == 0) {
return TRUE;
}
}
// check if a new nickname maps to a pending nick change for this user
if (muc_is_room_pending_nick_change(from_jid->barejid)) {
if (muc_nick_change_pending(from_jid->barejid)) {
char *new_nick = from_jid->resourcepart;
if (new_nick) {
char *nick = muc_get_room_nick(from_jid->barejid);
char *old_nick = muc_get_old_nick(from_jid->barejid, new_nick);
char *nick = muc_nick(from_jid->barejid);
char *old_nick = muc_old_nick(from_jid->barejid, new_nick);
if (g_strcmp0(old_nick, nick) == 0) {
return TRUE;
}