diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-23 15:19:44 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-23 15:19:52 +0300 |
| commit | 3562b7632f2f567d5da082438460b953a36ec46b (patch) | |
| tree | 2ee7c4167f6f8d59338f144546a0db115112a9d3 /protocols/JabberG/src/jabber_chat.cpp | |
| parent | 69dc1ceb837afec8322da632b3a0184a84a3a8d4 (diff) | |
Jabber:
- unused function JabberGetPictureType inlined;
- fixes #1509 (Miranda receive duplicate incoming messages if contact is not in roster Jabber);
- code cleaning;
Diffstat (limited to 'protocols/JabberG/src/jabber_chat.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_chat.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index d587c3a03b..8869d206db 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -68,13 +68,14 @@ struct TRoleOrAffiliationInfo if (me->m_affiliation == AFFILIATION_OWNER) return TRUE;
if (me == him) return FALSE;
if (me->m_affiliation <= him->m_affiliation) return FALSE;
- if (me->m_role < this->min_role) return FALSE;
- if (me->m_affiliation < this->min_affiliation) return FALSE;
+ if (me->m_role < min_role) return FALSE;
+ if (me->m_affiliation < min_affiliation) return FALSE;
return TRUE;
}
+
void translate()
{
- this->title = TranslateW(this->title_en);
+ title = TranslateW(title_en);
}
};
|