diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-27 13:50:53 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-27 13:50:53 +0000 |
| commit | 5f8a607f900a42e27bf166b86185001aadf3e9f2 (patch) | |
| tree | 6c69f5caebc55e84437ddc23013fada0a69af397 /protocols | |
| parent | 5e0f2fb896d874f9b7f5c069a90de64305089542 (diff) | |
more fun:
- MS_AWAYMSG_GETSTATUSMSGW/T is present in any MIID_SRAWAY plugin, so there's no need to check its existence;
- therefore MS_AWAYMSG_GETSTATUSMSG considered useless, cause it has no references
git-svn-id: http://svn.miranda-ng.org/main/trunk@8293 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/JabberG/src/jabber_rc.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/protocols/JabberG/src/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp index b1ae868e3a..3f72827bce 100644 --- a/protocols/JabberG/src/jabber_rc.cpp +++ b/protocols/JabberG/src/jabber_rc.cpp @@ -323,16 +323,15 @@ int CJabberProto::AdhocSetStatusHandler(HXML, CJabberIqInfo *pInfo, CJabberAdhoc fieldNode = xNode << XCHILD(_T("field")) << XATTR(_T("label"), TranslateT("Change global status"))
<< XATTR(_T("type"), _T("boolean")) << XATTR(_T("var"), _T("status-global"));
- char* szStatusMsg = (char *)CallService(MS_AWAYMSG_GETSTATUSMSG, status, 0);
- if (szStatusMsg) {
- fieldNode << XCHILD(_T("value"), _A2T(szStatusMsg));
- mir_free(szStatusMsg);
- }
+ ptrT tszStatusMsg((TCHAR*)CallService(MS_AWAYMSG_GETSTATUSMSGT, status, 0));
+ if (tszStatusMsg)
+ fieldNode << XCHILD(_T("value"), szStatusMsg);
m_ThreadInfo->send(iq);
return JABBER_ADHOC_HANDLER_STATUS_EXECUTING;
}
- else if (pSession->GetStage() == 1) {
+
+ if (pSession->GetStage() == 1) {
// result form here
HXML commandNode = pInfo->GetChildNode();
HXML xNode = xmlGetChildByTag(commandNode, "x", "xmlns", JABBER_FEAT_DATA_FORMS);
|