diff options
Diffstat (limited to 'protocols/JabberG/src')
| -rw-r--r-- | protocols/JabberG/src/jabber_chat.cpp | 7 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_db_utils.h | 4 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_disco.cpp | 1 |
3 files changed, 5 insertions, 7 deletions
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index bb7583fbd5..cf3aa9cb95 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -769,7 +769,7 @@ public: {
if (!m_room) return;
- TCHAR *text = m_txtReason.GetText();
+ ptrT text(m_txtReason.GetText());
HWND hwndList = GetDlgItem(m_hwnd, IDC_CLIST);
// invite users from roster
@@ -788,10 +788,9 @@ public: // invite others
for (int i = 0; i < m_newJids.getCount(); i++)
- if (SendMessage(hwndList, CLM_GETCHECKMARK, (WPARAM)m_newJids[i]->hItem, 0))
- InviteUser(m_newJids[i]->jid, text);
+ if (SendMessage(hwndList, CLM_GETCHECKMARK, (WPARAM)m_newJids[i]->hItem, 0))
+ InviteUser(m_newJids[i]->jid, text);
- mir_free(text);
Close();
}
};
diff --git a/protocols/JabberG/src/jabber_db_utils.h b/protocols/JabberG/src/jabber_db_utils.h index 605cee97c7..e0df04851a 100644 --- a/protocols/JabberG/src/jabber_db_utils.h +++ b/protocols/JabberG/src/jabber_db_utils.h @@ -84,7 +84,7 @@ struct CJabberOptions CMOption<BYTE> ProcessXMPPLinks;
CMOption<BYTE> IgnoreRosterGroups;
- CJabberOptions(PROTO_INTERFACE *proto):
+ CJabberOptions(PROTO_INTERFACE *proto) :
BsDirect(proto, "BsDirect", TRUE),
AllowVersionRequests(proto, "AllowVersionRequests", TRUE),
AcceptHttpAuth(proto, "AcceptHttpAuth", TRUE),
@@ -139,7 +139,7 @@ struct CJabberOptions ConnectionKeepAliveTimeout(proto, "ConnectionKeepAliveTimeout", 50000),
ProcessXMPPLinks(proto, "ProcessXMPPLinks", FALSE),
IgnoreRosterGroups(proto, "IgnoreRosterGroups", FALSE)
- {}
+ {}
};
#endif // __jabber_db_utils_h__
diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp index a2ab2eb010..f9090db6e6 100644 --- a/protocols/JabberG/src/jabber_disco.cpp +++ b/protocols/JabberG/src/jabber_disco.cpp @@ -628,7 +628,6 @@ void CJabberDlgDiscovery::OnInitDialog() {
CSuper::OnInitDialog();
-// TranslateDialogDefault(m_hwnd);
WindowSetIcon(m_hwnd, m_proto, "servicediscovery");
if (m_jid) {
|