diff options
| author | George Hazan <ghazan@miranda.im> | 2019-05-04 21:09:31 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-05-04 21:09:31 +0300 |
| commit | 81b62e61714b9b0c728d35a1a9ee11fe9f844fef (patch) | |
| tree | e7a7dabe0850aeeacd2fbb8057540df79852b3a4 | |
| parent | 2ba6bd1d43de907bc4eaddf190d9190c939d9a08 (diff) | |
fixes #1940 (Jabber: crash on starting Miranda-NG after last update)
| -rwxr-xr-x | protocols/JabberG/src/jabber_omemo.cpp | 2 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_xml.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/protocols/JabberG/src/jabber_omemo.cpp b/protocols/JabberG/src/jabber_omemo.cpp index cab97f697d..429f8a6ad6 100755 --- a/protocols/JabberG/src/jabber_omemo.cpp +++ b/protocols/JabberG/src/jabber_omemo.cpp @@ -1812,7 +1812,7 @@ void CJabberProto::OmemoAnnounceDevice() XmlNodeIq iq("set", SerialNext());
iq << XATTR("from", JabberStripJid(m_ThreadInfo->fullJID, szBareJid, _countof_portable(szBareJid)));
TiXmlElement *publish_node = iq << XCHILDNS("pubsub", "http://jabber.org/protocol/pubsub") << XCHILD("publish") << XATTR("node", JABBER_FEAT_OMEMO ".devicelist");
- TiXmlElement *list_node = publish_node << XCHILDNS("item") << XCHILDNS("list", JABBER_FEAT_OMEMO);
+ TiXmlElement *list_node = publish_node << XCHILD("item") << XCHILDNS("list", JABBER_FEAT_OMEMO);
for (int i = 0; ; ++i) {
mir_snprintf(setting_name, "OmemoDeviceId%d", i);
diff --git a/protocols/JabberG/src/jabber_xml.h b/protocols/JabberG/src/jabber_xml.h index d0babbcfb4..5d96ded78f 100644 --- a/protocols/JabberG/src/jabber_xml.h +++ b/protocols/JabberG/src/jabber_xml.h @@ -162,7 +162,7 @@ struct XCHILDNS {
const char *name, *ns;
- __forceinline XCHILDNS(const char *_name, const char *_ns = nullptr) :
+ __forceinline XCHILDNS(const char *_name, const char *_ns) :
name(_name),
ns(_ns)
{}
|