diff options
| author | George Hazan <ghazan@miranda.im> | 2019-02-23 15:06:01 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-02-23 15:06:01 +0300 |
| commit | 4080ed23db3d8463c9c6aceddd3670dbed9c379e (patch) | |
| tree | ce80831675532fe2de97072b23ebbb895ec4cdc0 /protocols/JabberG/src/jabber_iqid_muc.cpp | |
| parent | dffa41d2751a0ae5c05a2943107abffc48fcf0dd (diff) | |
Jabber:
- fixes #1844 (Tab button doesn't work in Jabber registration form);
- added Escape handler for any dynamic form to inform parent dialog;
- massive dynamic forms-related XML code cleaning & reordering;
- now form fiields without types are also processed;
- vertical scrollbar is hidden if it's not needed;
- hidden fields do not eat form space anymore
Diffstat (limited to 'protocols/JabberG/src/jabber_iqid_muc.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_iqid_muc.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber_iqid_muc.cpp b/protocols/JabberG/src/jabber_iqid_muc.cpp index 2043ac4b45..03c9fff902 100644 --- a/protocols/JabberG/src/jabber_iqid_muc.cpp +++ b/protocols/JabberG/src/jabber_iqid_muc.cpp @@ -27,12 +27,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "jabber_iq.h"
#include "jabber_caps.h"
-void CJabberProto::SetMucConfig(TiXmlElement *node, void *from)
+void CJabberProto::SetMucConfig(CJabberFormDlg *pDlg, void *from)
{
if (m_ThreadInfo && from) {
XmlNodeIq iq("set", SerialNext(), (char*)from);
- TiXmlElement *query = iq << XQUERY(JABBER_FEAT_MUC_OWNER);
- query->InsertEndChild(node);
+ auto *query = iq << XQUERY(JABBER_FEAT_MUC_OWNER);
+ pDlg->GetData(query);
m_ThreadInfo->send(iq);
}
}
@@ -50,7 +50,7 @@ void CJabberProto::OnIqResultGetMuc(const TiXmlElement *iqNode, CJabberIqInfo*) if (!mir_strcmp(type, "result"))
if (auto *queryNode = XmlGetChildByTag(iqNode, "query", "xmlns", JABBER_FEAT_MUC_OWNER))
if (auto *xNode = XmlGetChildByTag(queryNode, "x", "xmlns", JABBER_FEAT_DATA_FORMS))
- FormCreateDialog(xNode, "Jabber Conference Room Configuration", &CJabberProto::SetMucConfig, mir_strdup(from));
+ (new CJabberFormDlg(this, xNode, "Jabber Conference Room Configuration", &CJabberProto::SetMucConfig, mir_strdup(from)))->Display();
}
/////////////////////////////////////////////////////////////////////////////////////////
|