From d2dd1c6dddd3e690ad13d2b355de60d3724e8ec6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 15 Apr 2016 10:09:13 +0000 Subject: code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@16658 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_iqid.cpp | 210 +++++----- protocols/JabberG/src/jabber_opt.cpp | 735 +++++++++++++++++----------------- 2 files changed, 479 insertions(+), 466 deletions(-) (limited to 'protocols') diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index 71ac576a3b..8b1aba4adb 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -35,7 +35,7 @@ void CJabberProto::OnIqResultServerDiscoInfo(HXML iqNode, CJabberIqInfo*) return; const TCHAR *type = XmlGetAttrValue(iqNode, _T("type")); - if ( mir_tstrcmp(type, _T("result"))) + if (mir_tstrcmp(type, _T("result"))) return; HXML query = XmlGetChildByTag(iqNode, "query", "xmlns", JABBER_FEAT_DISCO_INFO); @@ -44,7 +44,7 @@ void CJabberProto::OnIqResultServerDiscoInfo(HXML iqNode, CJabberIqInfo*) HXML identity; for (int i = 1; (identity = XmlGetNthChild(query, _T("identity"), i)) != NULL; i++) { - JABBER_DISCO_FIELD tmp = { + JABBER_DISCO_FIELD tmp = { XmlGetAttrValue(identity, _T("category")), XmlGetAttrValue(identity, _T("type")), XmlGetAttrValue(identity, _T("name")) }; @@ -154,7 +154,8 @@ void CJabberProto::OnProcessLoginRq(ThreadData *info, DWORD rq) } OnProcessLoginRq(info, JABBER_LOGIN_BOOKMARKS_AJ); -} } + } +} void CJabberProto::OnLoggedIn() { @@ -175,7 +176,7 @@ void CJabberProto::OnLoggedIn() // Server-side notes m_ThreadInfo->send( - XmlNodeIq( AddIQ(&CJabberProto::OnIqResultNotes, JABBER_IQ_TYPE_GET)) + XmlNodeIq(AddIQ(&CJabberProto::OnIqResultNotes, JABBER_IQ_TYPE_GET)) << XQUERY(JABBER_FEAT_PRIVATE_STORAGE) << XCHILDNS(_T("storage"), JABBER_FEAT_MIRANDA_NOTES)); @@ -185,8 +186,8 @@ void CJabberProto::OnLoggedIn() m_bPepSupported = false; m_ThreadInfo->jabberServerCaps = JABBER_RESOURCE_CAPS_NONE; - - m_ThreadInfo->send( + + m_ThreadInfo->send( XmlNodeIq(AddIQ(&CJabberProto::OnIqResultServerDiscoInfo, JABBER_IQ_TYPE_GET, _A2T(m_ThreadInfo->conn.server))) << XQUERY(JABBER_FEAT_DISCO_INFO)); @@ -230,7 +231,7 @@ void CJabberProto::OnIqResultGetAuth(HXML iqNode, CJabberIqInfo*) return; } - if (XmlGetChild(queryNode , "resource") != NULL) + if (XmlGetChild(queryNode, "resource") != NULL) query << XCHILD(_T("resource"), m_ThreadInfo->resource); m_ThreadInfo->send(iq); @@ -243,7 +244,8 @@ void CJabberProto::OnIqResultGetAuth(HXML iqNode, CJabberIqInfo*) MsgPopup(NULL, text, TranslateT("Jabber Authentication")); JLoginFailed(LOGINERR_WRONGPASSWORD); m_ThreadInfo = NULL; // To disallow auto reconnect -} } + } +} void CJabberProto::OnIqResultSetAuth(HXML iqNode, CJabberIqInfo*) { @@ -270,7 +272,8 @@ void CJabberProto::OnIqResultSetAuth(HXML iqNode, CJabberIqInfo*) MsgPopup(NULL, text, TranslateT("Jabber Authentication")); JLoginFailed(LOGINERR_WRONGPASSWORD); m_ThreadInfo = NULL; // To disallow auto reconnect -} } + } +} void CJabberProto::OnIqResultBind(HXML iqNode, CJabberIqInfo *pInfo) { @@ -308,7 +311,7 @@ void CJabberProto::OnIqResultSession(HXML, CJabberIqInfo *pInfo) void CJabberProto::GroupchatJoinByHContact(MCONTACT hContact, bool autojoin) { - ptrT roomjid( getTStringA(hContact, "ChatRoomID")); + ptrT roomjid(getTStringA(hContact, "ChatRoomID")); if (roomjid == NULL) return; @@ -319,7 +322,7 @@ void CJabberProto::GroupchatJoinByHContact(MCONTACT hContact, bool autojoin) server[0] = 0; server++; - ptrT nick( getTStringA(hContact, "MyNick")); + ptrT nick(getTStringA(hContact, "MyNick")); if (nick == NULL) { nick = JabberNickFromJID(m_szJabberJID); if (nick == NULL) @@ -341,7 +344,7 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo) return; } - HXML queryNode = XmlGetChild(iqNode , "query"); + HXML queryNode = XmlGetChild(iqNode, "query"); if (queryNode == NULL) { mir_free(szGroupDelimeter); return; @@ -360,10 +363,10 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo) LIST chatRooms(10); OBJLIST *httpavatars = new OBJLIST(20, JABBER_HTTP_AVATARS::compare); - for (int i=0; ; i++) { - BOOL bIsTransport=FALSE; + for (int i = 0;; i++) { + BOOL bIsTransport = FALSE; - HXML itemNode = XmlGetChild(queryNode ,i); + HXML itemNode = XmlGetChild(queryNode, i); if (!itemNode) break; @@ -399,7 +402,7 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo) mir_free(item->nick); item->nick = nick; - HXML groupNode = XmlGetChild(itemNode , "group"); + HXML groupNode = XmlGetChild(itemNode, "group"); replaceStrT(item->group, XmlGetText(groupNode)); // check group delimiters: @@ -417,7 +420,7 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo) } if (name != NULL) { - ptrT tszNick( getTStringA("Nick")); + ptrT tszNick(getTStringA("Nick")); if (tszNick != NULL) { if (mir_tstrcmp(nick, tszNick) != 0) db_set_ts(hContact, "CList", "MyHandle", nick); @@ -428,7 +431,7 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo) } else db_unset(hContact, "CList", "MyHandle"); - if ( isChatRoom(hContact)) { + if (isChatRoom(hContact)) { GCSESSION gcw = { sizeof(gcw) }; gcw.iType = GCW_CHATROOM; gcw.pszModule = m_szModuleName; @@ -451,9 +454,9 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo) Clist_CreateGroup(0, item->group); // Don't set group again if already correct, or Miranda may show wrong group count in some case - ptrT tszGroup( db_get_tsa(hContact, "CList", "Group")); + ptrT tszGroup(db_get_tsa(hContact, "CList", "Group")); if (tszGroup != NULL) { - if ( mir_tstrcmp(tszGroup, item->group)) + if (mir_tstrcmp(tszGroup, item->group)) db_set_ts(hContact, "CList", "Group", item->group); } else db_set_ts(hContact, "CList", "Group", item->group); @@ -480,9 +483,9 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo) // Delete orphaned contacts (if roster sync is enabled) if (m_options.RosterSync == TRUE) { - for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; ) { + for (MCONTACT hContact = db_find_first(m_szModuleName); hContact;) { MCONTACT hNext = db_find_next(hContact, m_szModuleName); - ptrT jid( getTStringA(hContact, "jid")); + ptrT jid(getTStringA(hContact, "jid")); if (jid != NULL && !ListGetItemPtr(LIST_ROSTER, jid)) { debugLog(_T("Syncing roster: preparing to delete %s (hContact=0x%x)"), jid, hContact); CallService(MS_DB_CONTACT_DELETE, hContact, 0); @@ -497,7 +500,7 @@ void CJabberProto::OnIqResultGetRoster(HXML iqNode, CJabberIqInfo *pInfo) SetServerStatus(m_iDesiredStatus); if (m_options.AutoJoinConferences) - for (int i=0; i < chatRooms.getCount(); i++) + for (int i = 0; i < chatRooms.getCount(); i++) GroupchatJoinByHContact((DWORD_PTR)chatRooms[i], true); UI_SAFE_NOTIFY_HWND(m_hwndJabberAddBookmark, WM_JABBER_CHECK_ONLINE); @@ -521,7 +524,7 @@ void CJabberProto::OnIqResultGetRegister(HXML iqNode, CJabberIqInfo*) HXML queryNode; const TCHAR *type; if ((type = XmlGetAttrValue(iqNode, _T("type"))) == NULL) return; - if ((queryNode = XmlGetChild(iqNode , "query")) == NULL) return; + if ((queryNode = XmlGetChild(iqNode, "query")) == NULL) return; if (!mir_tstrcmp(type, _T("result"))) { if (m_hwndAgentRegInput) @@ -529,11 +532,13 @@ void CJabberProto::OnIqResultGetRegister(HXML iqNode, CJabberIqInfo*) } else if (!mir_tstrcmp(type, _T("error"))) { if (m_hwndAgentRegInput) { - HXML errorNode = XmlGetChild(iqNode , "error"); + HXML errorNode = XmlGetChild(iqNode, "error"); TCHAR *str = JabberErrorMsg(errorNode); SendMessage(m_hwndAgentRegInput, WM_JABBER_REGINPUT_ACTIVATE, 0 /*error*/, (LPARAM)str); mir_free(str); -} } } + } + } +} void CJabberProto::OnIqResultSetRegister(HXML iqNode, CJabberIqInfo*) { @@ -555,11 +560,13 @@ void CJabberProto::OnIqResultSetRegister(HXML iqNode, CJabberIqInfo*) } else if (!mir_tstrcmp(type, _T("error"))) { if (m_hwndRegProgress) { - HXML errorNode = XmlGetChild(iqNode , "error"); + HXML errorNode = XmlGetChild(iqNode, "error"); TCHAR *str = JabberErrorMsg(errorNode); SendMessage(m_hwndRegProgress, WM_JABBER_REGDLG_UPDATE, 100, (LPARAM)str); mir_free(str); -} } } + } + } +} ///////////////////////////////////////////////////////////////////////////////////////// // JabberIqResultGetVcard - processes the server-side v-card @@ -632,7 +639,7 @@ void CJabberProto::OnIqResultGetVcardPhoto(HXML n, MCONTACT hContact, bool &hasP static TCHAR* sttGetText(HXML node, char* tag) { - HXML n = XmlGetChild(node , tag); + HXML n = XmlGetChild(node, tag); if (n == NULL) return NULL; @@ -654,7 +661,7 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*) if (id == m_nJabberSearchID) { m_nJabberSearchID = -1; - if ((vCardNode = XmlGetChild(iqNode , "vCard")) != NULL) { + if ((vCardNode = XmlGetChild(iqNode, "vCard")) != NULL) { if (!mir_tstrcmp(type, _T("result"))) { PROTOSEARCHRESULT psr = { 0 }; psr.cbSize = sizeof(psr); @@ -694,18 +701,18 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*) if (mir_tstrcmp(type, _T("result"))) return; - bool hasFn = false, hasNick = false, hasGiven = false, hasFamily = false, hasMiddle = false, + bool hasFn = false, hasNick = false, hasGiven = false, hasFamily = false, hasMiddle = false, hasBday = false, hasGender = false, hasPhone = false, hasFax = false, hasCell = false, hasUrl = false, - hasHome = false, hasHomeStreet = false, hasHomeStreet2 = false, hasHomeLocality = false, - hasHomeRegion = false, hasHomePcode = false, hasHomeCtry = false, + hasHome = false, hasHomeStreet = false, hasHomeStreet2 = false, hasHomeLocality = false, + hasHomeRegion = false, hasHomePcode = false, hasHomeCtry = false, hasWork = false, hasWorkStreet = false, hasWorkStreet2 = false, hasWorkLocality = false, hasWorkRegion = false, hasWorkPcode = false, hasWorkCtry = false, hasOrgname = false, hasOrgunit = false, hasRole = false, hasTitle = false, hasDesc = false, hasPhoto = false; int nEmail = 0, nPhone = 0, nYear, nMonth, nDay; - if ((vCardNode = XmlGetChild(iqNode , "vCard")) != NULL) { - for (int i=0; ; i++) { - n = XmlGetChild(vCardNode ,i); + if ((vCardNode = XmlGetChild(iqNode, "vCard")) != NULL) { + for (int i = 0;; i++) { + n = XmlGetChild(vCardNode, i); if (!n) break; if (XmlGetName(n) == NULL) continue; @@ -724,22 +731,23 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*) else if (!mir_tstrcmp(XmlGetName(n), _T("N"))) { // First/Last name if (!hasGiven && !hasFamily && !hasMiddle) { - if ((m=XmlGetChild(n, "GIVEN")) != NULL && XmlGetText(m) != NULL) { + if ((m = XmlGetChild(n, "GIVEN")) != NULL && XmlGetText(m) != NULL) { hasGiven = true; setTString(hContact, "FirstName", XmlGetText(m)); } - if ((m=XmlGetChild(n, "FAMILY")) != NULL && XmlGetText(m) != NULL) { + if ((m = XmlGetChild(n, "FAMILY")) != NULL && XmlGetText(m) != NULL) { hasFamily = true; setTString(hContact, "LastName", XmlGetText(m)); } - if ((m=XmlGetChild(n, "MIDDLE")) != NULL && XmlGetText(m) != NULL) { + if ((m = XmlGetChild(n, "MIDDLE")) != NULL && XmlGetText(m) != NULL) { hasMiddle = true; setTString(hContact, "MiddleName", XmlGetText(m)); - } } + } + } } else if (!mir_tstrcmp(XmlGetName(n), _T("EMAIL"))) { // E-mail address(es) - if ((m=XmlGetChild(n, "USERID")) == NULL) // Some bad client put e-mail directly in instead of + if ((m = XmlGetChild(n, "USERID")) == NULL) // Some bad client put e-mail directly in instead of m = n; if (XmlGetText(m) != NULL) { char text[100]; @@ -771,10 +779,10 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*) if (_stscanf(XmlGetText(n), _T("%d-%d-%d"), &nYear, &nMonth, &nDay) == 3) { hasBday = true; setWord(hContact, "BirthYear", (WORD)nYear); - setByte(hContact, "BirthMonth", (BYTE) nMonth); - setByte(hContact, "BirthDay", (BYTE) nDay); + setByte(hContact, "BirthMonth", (BYTE)nMonth); + setByte(hContact, "BirthDay", (BYTE)nDay); - SYSTEMTIME sToday = {0}; + SYSTEMTIME sToday = { 0 }; GetLocalTime(&sToday); int nAge = sToday.wYear - nYear; if (sToday.wMonth < nMonth || (sToday.wMonth == nMonth && sToday.wDay < nDay)) @@ -786,7 +794,8 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*) else { hasBday = true; setTString("BirthDate", XmlGetText(n)); - } } + } + } } else if (!mir_tstrcmp(XmlGetName(n), _T("GENDER"))) { // Gender @@ -794,106 +803,113 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*) if (hContact != NULL) { if (XmlGetText(n)[0] && strchr("mMfF", XmlGetText(n)[0]) != NULL) { hasGender = true; - setByte(hContact, "Gender", (BYTE) toupper(XmlGetText(n)[0])); + setByte(hContact, "Gender", (BYTE)toupper(XmlGetText(n)[0])); } } else { hasGender = true; setTString("GenderString", XmlGetText(n)); - } } + } + } } else if (!mir_tstrcmp(XmlGetName(n), _T("ADR"))) { if (!hasHome && XmlGetChild(n, "HOME") != NULL) { // Home address TCHAR text[128]; hasHome = true; - if ((m=XmlGetChild(n, "STREET")) != NULL && XmlGetText(m) != NULL) { + if ((m = XmlGetChild(n, "STREET")) != NULL && XmlGetText(m) != NULL) { hasHomeStreet = true; if (hContact != NULL) { - if ((o=XmlGetChild(n, "EXTADR")) != NULL && XmlGetText(o) != NULL) + if ((o = XmlGetChild(n, "EXTADR")) != NULL && XmlGetText(o) != NULL) mir_sntprintf(text, _T("%s\r\n%s"), XmlGetText(m), XmlGetText(o)); - else if ((o=XmlGetChild(n, "EXTADD")) != NULL && XmlGetText(o) != NULL) + else if ((o = XmlGetChild(n, "EXTADD")) != NULL && XmlGetText(o) != NULL) mir_sntprintf(text, _T("%s\r\n%s"), XmlGetText(m), XmlGetText(o)); else _tcsncpy_s(text, XmlGetText(m), _TRUNCATE); - text[_countof(text)-1] = '\0'; + text[_countof(text) - 1] = '\0'; setTString(hContact, "Street", text); } else { setTString(hContact, "Street", XmlGetText(m)); - if ((m=XmlGetChild(n, "EXTADR")) == NULL) + if ((m = XmlGetChild(n, "EXTADR")) == NULL) m = XmlGetChild(n, "EXTADD"); if (m != NULL && XmlGetText(m) != NULL) { hasHomeStreet2 = true; setTString(hContact, "Street2", XmlGetText(m)); - } } } + } + } + } - if ((m=XmlGetChild(n, "LOCALITY")) != NULL && XmlGetText(m) != NULL) { + if ((m = XmlGetChild(n, "LOCALITY")) != NULL && XmlGetText(m) != NULL) { hasHomeLocality = true; setTString(hContact, "City", XmlGetText(m)); } - if ((m=XmlGetChild(n, "REGION")) != NULL && XmlGetText(m) != NULL) { + if ((m = XmlGetChild(n, "REGION")) != NULL && XmlGetText(m) != NULL) { hasHomeRegion = true; setTString(hContact, "State", XmlGetText(m)); } - if ((m=XmlGetChild(n, "PCODE")) != NULL && XmlGetText(m) != NULL) { + if ((m = XmlGetChild(n, "PCODE")) != NULL && XmlGetText(m) != NULL) { hasHomePcode = true; setTString(hContact, "ZIP", XmlGetText(m)); } - if ((m=XmlGetChild(n, "CTRY")) == NULL || XmlGetText(m) == NULL) // Some bad client use instead of + if ((m = XmlGetChild(n, "CTRY")) == NULL || XmlGetText(m) == NULL) // Some bad client use instead of m = XmlGetChild(n, "COUNTRY"); if (m != NULL && XmlGetText(m) != NULL) { hasHomeCtry = true; setTString(hContact, "Country", XmlGetText(m)); - } } + } + } if (!hasWork && XmlGetChild(n, "WORK") != NULL) { // Work address hasWork = true; - if ((m=XmlGetChild(n, "STREET")) != NULL && XmlGetText(m) != NULL) { + if ((m = XmlGetChild(n, "STREET")) != NULL && XmlGetText(m) != NULL) { TCHAR text[128]; hasWorkStreet = true; if (hContact != NULL) { - if ((o=XmlGetChild(n, "EXTADR")) != NULL && XmlGetText(o) != NULL) + if ((o = XmlGetChild(n, "EXTADR")) != NULL && XmlGetText(o) != NULL) mir_sntprintf(text, _T("%s\r\n%s"), XmlGetText(m), XmlGetText(o)); - else if ((o=XmlGetChild(n, "EXTADD")) != NULL && XmlGetText(o) != NULL) + else if ((o = XmlGetChild(n, "EXTADD")) != NULL && XmlGetText(o) != NULL) mir_sntprintf(text, _T("%s\r\n%s"), XmlGetText(m), XmlGetText(o)); else _tcsncpy_s(text, XmlGetText(m), _TRUNCATE); - text[_countof(text)-1] = '\0'; + text[_countof(text) - 1] = '\0'; setTString(hContact, "CompanyStreet", text); } else { setTString(hContact, "CompanyStreet", XmlGetText(m)); - if ((m=XmlGetChild(n, "EXTADR")) == NULL) + if ((m = XmlGetChild(n, "EXTADR")) == NULL) m = XmlGetChild(n, "EXTADD"); if (m != NULL && XmlGetText(m) != NULL) { hasWorkStreet2 = true; setTString(hContact, "CompanyStreet2", XmlGetText(m)); - } } } + } + } + } - if ((m=XmlGetChild(n, "LOCALITY")) != NULL && XmlGetText(m) != NULL) { + if ((m = XmlGetChild(n, "LOCALITY")) != NULL && XmlGetText(m) != NULL) { hasWorkLocality = true; setTString(hContact, "CompanyCity", XmlGetText(m)); } - if ((m=XmlGetChild(n, "REGION")) != NULL && XmlGetText(m) != NULL) { + if ((m = XmlGetChild(n, "REGION")) != NULL && XmlGetText(m) != NULL) { hasWorkRegion = true; setTString(hContact, "CompanyState", XmlGetText(m)); } - if ((m=XmlGetChild(n, "PCODE")) != NULL && XmlGetText(m) != NULL) { + if ((m = XmlGetChild(n, "PCODE")) != NULL && XmlGetText(m) != NULL) { hasWorkPcode = true; setTString(hContact, "CompanyZIP", XmlGetText(m)); } - if ((m=XmlGetChild(n, "CTRY")) == NULL || XmlGetText(m) == NULL) // Some bad client use instead of + if ((m = XmlGetChild(n, "CTRY")) == NULL || XmlGetText(m) == NULL) // Some bad client use instead of m = XmlGetChild(n, "COUNTRY"); if (m != NULL && XmlGetText(m) != NULL) { hasWorkCtry = true; setTString(hContact, "CompanyCountry", XmlGetText(m)); - } } + } + } } else if (!mir_tstrcmp(XmlGetName(n), _T("TEL"))) { // Telephone/Fax/Cellular - if ((m=XmlGetChild(n, "NUMBER")) != NULL && XmlGetText(m) != NULL) { + if ((m = XmlGetChild(n, "NUMBER")) != NULL && XmlGetText(m) != NULL) { if (hContact != NULL) { if (!hasFax && XmlGetChild(n, "FAX") != NULL) { hasFax = true; @@ -984,7 +1000,8 @@ void CJabberProto::OnIqResultGetVcard(HXML iqNode, CJabberIqInfo*) } else if (!mir_tstrcmp(XmlGetName(n), _T("PHOTO"))) OnIqResultGetVcardPhoto(n, hContact, hasPhoto); - } } + } + } if (hasFn && !hasNick) { ptrT nick(getTStringA(hContact, "Nick")); @@ -1186,10 +1203,10 @@ void CJabberProto::OnIqResultExtSearch(HXML iqNode, CJabberIqInfo*) return; if (!mir_tstrcmp(type, _T("result"))) { - if ((queryNode=XmlGetChild(iqNode , "query")) == NULL) return; - if ((queryNode=XmlGetChild(queryNode , "x")) == NULL) return; - for (int i=0; ; i++) { - HXML itemNode = XmlGetChild(queryNode ,i); + if ((queryNode = XmlGetChild(iqNode, "query")) == NULL) return; + if ((queryNode = XmlGetChild(queryNode, "x")) == NULL) return; + for (int i = 0;; i++) { + HXML itemNode = XmlGetChild(queryNode, i); if (!itemNode) break; if (mir_tstrcmp(XmlGetName(itemNode), _T("item"))) @@ -1199,8 +1216,8 @@ void CJabberProto::OnIqResultExtSearch(HXML iqNode, CJabberIqInfo*) psr.cbSize = sizeof(psr); psr.flags = PSR_TCHAR; - for (int j=0; ; j++) { - HXML fieldNode = XmlGetChild(itemNode ,j); + for (int j = 0;; j++) { + HXML fieldNode = XmlGetChild(itemNode, j); if (!fieldNode) break; @@ -1211,7 +1228,7 @@ void CJabberProto::OnIqResultExtSearch(HXML iqNode, CJabberIqInfo*) if (fieldName == NULL) continue; - HXML n = XmlGetChild(fieldNode , "value"); + HXML n = XmlGetChild(fieldNode, "value"); if (n == NULL) continue; @@ -1250,10 +1267,10 @@ void CJabberProto::OnIqResultSetPassword(HXML iqNode, CJabberIqInfo*) if (!mir_tstrcmp(type, _T("result"))) { _tcsncpy_s(m_ThreadInfo->conn.password, m_ThreadInfo->tszNewPassword, _TRUNCATE); - MessageBox(NULL, TranslateT("Password is successfully changed. Don't forget to update your password in the Jabber protocol option."), TranslateT("Change Password"), MB_OK|MB_ICONINFORMATION|MB_SETFOREGROUND); + MessageBox(NULL, TranslateT("Password is successfully changed. Don't forget to update your password in the Jabber protocol option."), TranslateT("Change Password"), MB_OK | MB_ICONINFORMATION | MB_SETFOREGROUND); } else if (!mir_tstrcmp(type, _T("error"))) - MessageBox(NULL, TranslateT("Password cannot be changed."), TranslateT("Change Password"), MB_OK|MB_ICONSTOP|MB_SETFOREGROUND); + MessageBox(NULL, TranslateT("Password cannot be changed."), TranslateT("Change Password"), MB_OK | MB_ICONSTOP | MB_SETFOREGROUND); } void CJabberProto::OnIqResultGetVCardAvatar(HXML iqNode, CJabberIqInfo*) @@ -1272,22 +1289,22 @@ void CJabberProto::OnIqResultGetVCardAvatar(HXML iqNode, CJabberIqInfo*) if ((type = XmlGetAttrValue(iqNode, _T("type"))) == NULL) return; if (mir_tstrcmp(type, _T("result"))) return; - HXML vCard = XmlGetChild(iqNode , "vCard"); + HXML vCard = XmlGetChild(iqNode, "vCard"); if (vCard == NULL) return; - vCard = XmlGetChild(vCard , "PHOTO"); + vCard = XmlGetChild(vCard, "PHOTO"); if (vCard == NULL) return; if (XmlGetChildCount(vCard) == 0) { delSetting(hContact, "AvatarHash"); - if ( ptrT( getTStringA(hContact, "AvatarSaved")) != NULL) { + if (ptrT(getTStringA(hContact, "AvatarSaved")) != NULL) { delSetting(hContact, "AvatarSaved"); ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, NULL, NULL); } return; } - const TCHAR *mimeType = XmlGetText( XmlGetChild(vCard , "TYPE")); - HXML n = XmlGetChild(vCard , "BINVAL"); + const TCHAR *mimeType = XmlGetText(XmlGetChild(vCard, "TYPE")); + HXML n = XmlGetChild(vCard, "BINVAL"); if (n == NULL) return; @@ -1310,11 +1327,11 @@ void CJabberProto::OnIqResultGetClientAvatar(HXML iqNode, CJabberIqInfo*) HXML n = NULL; if ((type = XmlGetAttrValue(iqNode, _T("type"))) != NULL && !mir_tstrcmp(type, _T("result"))) { - HXML queryNode = XmlGetChild(iqNode , "query"); + HXML queryNode = XmlGetChild(iqNode, "query"); if (queryNode != NULL) { const TCHAR *xmlns = XmlGetAttrValue(queryNode, _T("xmlns")); if (!mir_tstrcmp(xmlns, JABBER_FEAT_AVATAR)) - n = XmlGetChild(queryNode , "data"); + n = XmlGetChild(queryNode, "data"); } } @@ -1322,7 +1339,7 @@ void CJabberProto::OnIqResultGetClientAvatar(HXML iqNode, CJabberIqInfo*) OnIqResultGotAvatar(hContact, n, XmlGetAttrValue(n, _T("mimetype"))); return; } - + TCHAR szJid[JABBER_MAX_JID_LEN]; mir_tstrncpy(szJid, from, _countof(szJid)); TCHAR *res = _tcschr(szJid, _T('/')); @@ -1330,7 +1347,7 @@ void CJabberProto::OnIqResultGetClientAvatar(HXML iqNode, CJabberIqInfo*) *res = 0; // Try server stored avatar - XmlNodeIq iq( AddIQ(&CJabberProto::OnIqResultGetServerAvatar, JABBER_IQ_TYPE_GET, szJid)); + XmlNodeIq iq(AddIQ(&CJabberProto::OnIqResultGetServerAvatar, JABBER_IQ_TYPE_GET, szJid)); iq << XQUERY(JABBER_FEAT_SERVER_AVATAR); m_ThreadInfo->send(iq); } @@ -1350,7 +1367,7 @@ void CJabberProto::OnIqResultGetServerAvatar(HXML iqNode, CJabberIqInfo*) HXML n = NULL; const TCHAR *type = XmlGetAttrValue(iqNode, _T("type")); if (!mir_tstrcmp(type, _T("result"))) { - HXML queryNode = XmlGetChild(iqNode , "query"); + HXML queryNode = XmlGetChild(iqNode, "query"); if (queryNode != NULL) { const TCHAR *xmlns = XmlGetAttrValue(queryNode, _T("xmlns")); if (!mir_tstrcmp(xmlns, JABBER_FEAT_SERVER_AVATAR)) @@ -1362,7 +1379,7 @@ void CJabberProto::OnIqResultGetServerAvatar(HXML iqNode, CJabberIqInfo*) OnIqResultGotAvatar(hContact, n, XmlGetAttrValue(n, _T("mimetype"))); return; } - + TCHAR szJid[JABBER_MAX_JID_LEN]; mir_tstrncpy(szJid, from, _countof(szJid)); TCHAR *res = _tcschr(szJid, _T('/')); @@ -1371,15 +1388,14 @@ void CJabberProto::OnIqResultGetServerAvatar(HXML iqNode, CJabberIqInfo*) // Try VCard photo m_ThreadInfo->send( - XmlNodeIq( AddIQ(&CJabberProto::OnIqResultGetVCardAvatar, JABBER_IQ_TYPE_GET, szJid)) - << XCHILDNS(_T("vCard"), JABBER_FEAT_VCARD_TEMP)); + XmlNodeIq(AddIQ(&CJabberProto::OnIqResultGetVCardAvatar, JABBER_IQ_TYPE_GET, szJid)) << XCHILDNS(_T("vCard"), JABBER_FEAT_VCARD_TEMP)); } void CJabberProto::OnIqResultGotAvatar(MCONTACT hContact, HXML n, const TCHAR *mimeType) { unsigned resultLen; - ptrA body((char*)mir_base64_decode( _T2A(XmlGetText(n)), &resultLen)); + ptrA body((char*)mir_base64_decode(_T2A(XmlGetText(n)), &resultLen)); if (body == NULL) return; @@ -1427,7 +1443,7 @@ LBL_ErrFormat: char buffer[41]; setString(hContact, "AvatarSaved", bin2hex(digest, sizeof(digest), buffer)); ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, HANDLE(&ai), NULL); - debugLog(_T("Broadcast new avatar: %s"),ai.filename); + debugLog(_T("Broadcast new avatar: %s"), ai.filename); } else ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, HANDLE(&ai), NULL); } @@ -1492,7 +1508,7 @@ void CJabberProto::OnIqResultDiscoBookmarks(HXML iqNode, CJabberIqInfo*) } } -void CJabberProto::SetBookmarkRequest (XmlNodeIq& iq) +void CJabberProto::SetBookmarkRequest(XmlNodeIq& iq) { HXML query = iq << XQUERY(JABBER_FEAT_PRIVATE_STORAGE); HXML storage = query << XCHILDNS(_T("storage"), _T("storage:bookmarks")); @@ -1502,7 +1518,7 @@ void CJabberProto::SetBookmarkRequest (XmlNodeIq& iq) JABBER_LIST_ITEM *item = ListGetItemPtrFromIndex(i); if (item == NULL || item->jid == NULL) continue; - + if (!mir_tstrcmp(item->type, _T("conference"))) { HXML itemNode = storage << XCHILD(_T("conference")) << XATTR(_T("jid"), item->jid); if (item->name) diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index 9ac2c0ce8b..e6d8027464 100644 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "jabber_caps.h" #include "jabber_opttree.h" -static BOOL (WINAPI *pfnEnableThemeDialogTexture)(HANDLE, DWORD) = 0; +static BOOL(WINAPI *pfnEnableThemeDialogTexture)(HANDLE, DWORD) = 0; ///////////////////////////////////////////////////////////////////////////////////////// // JabberRegisterDlgProc - the dialog proc for registering new account @@ -36,199 +36,199 @@ static BOOL (WINAPI *pfnEnableThemeDialogTexture)(HANDLE, DWORD) = 0; #define STR_FORMAT _T("%s %s@%S:%d?") struct { TCHAR *szCode; TCHAR *szDescription; } g_LanguageCodes[] = { - { _T("aa"), LPGENT("Afar") }, - { _T("ab"), LPGENT("Abkhazian") }, - { _T("af"), LPGENT("Afrikaans") }, - { _T("ak"), LPGENT("Akan") }, - { _T("sq"), LPGENT("Albanian") }, - { _T("am"), LPGENT("Amharic") }, - { _T("ar"), LPGENT("Arabic") }, - { _T("an"), LPGENT("Aragonese") }, - { _T("hy"), LPGENT("Armenian") }, - { _T("as"), LPGENT("Assamese") }, - { _T("av"), LPGENT("Avaric") }, - { _T("ae"), LPGENT("Avestan") }, - { _T("ay"), LPGENT("Aymara") }, - { _T("az"), LPGENT("Azerbaijani") }, - { _T("ba"), LPGENT("Bashkir") }, - { _T("bm"), LPGENT("Bambara") }, - { _T("eu"), LPGENT("Basque") }, - { _T("be"), LPGENT("Belarusian") }, - { _T("bn"), LPGENT("Bengali") }, - { _T("bh"), LPGENT("Bihari") }, - { _T("bi"), LPGENT("Bislama") }, - { _T("bs"), LPGENT("Bosnian") }, - { _T("br"), LPGENT("Breton") }, - { _T("bg"), LPGENT("Bulgarian") }, - { _T("my"), LPGENT("Burmese") }, - { _T("ca"), LPGENT("Catalan; Valencian") }, - { _T("ch"), LPGENT("Chamorro") }, - { _T("ce"), LPGENT("Chechen") }, - { _T("zh"), LPGENT("Chinese") }, - { _T("cu"), LPGENT("Church Slavic; Old Slavonic") }, - { _T("cv"), LPGENT("Chuvash") }, - { _T("kw"), LPGENT("Cornish") }, - { _T("co"), LPGENT("Corsican") }, - { _T("cr"), LPGENT("Cree") }, - { _T("cs"), LPGENT("Czech") }, - { _T("da"), LPGENT("Danish") }, - { _T("dv"), LPGENT("Divehi; Dhivehi; Maldivian") }, - { _T("nl"), LPGENT("Dutch; Flemish") }, - { _T("dz"), LPGENT("Dzongkha") }, - { _T("en"), LPGENT("English") }, - { _T("eo"), LPGENT("Esperanto") }, - { _T("et"), LPGENT("Estonian") }, - { _T("ee"), LPGENT("Ewe") }, - { _T("fo"), LPGENT("Faroese") }, - { _T("fj"), LPGENT("Fijian") }, - { _T("fi"), LPGENT("Finnish") }, - { _T("fr"), LPGENT("French") }, - { _T("fy"), LPGENT("Western Frisian") }, - { _T("ff"), LPGENT("Fulah") }, - { _T("ka"), LPGENT("Georgian") }, - { _T("de"), LPGENT("German") }, - { _T("gd"), LPGENT("Gaelic; Scottish Gaelic") }, - { _T("ga"), LPGENT("Irish") }, - { _T("gl"), LPGENT("Galician") }, - { _T("gv"), LPGENT("Manx") }, - { _T("el"), LPGENT("Greek, Modern (1453-)") }, - { _T("gn"), LPGENT("Guarani") }, - { _T("gu"), LPGENT("Gujarati") }, - { _T("ht"), LPGENT("Haitian; Haitian Creole") }, - { _T("ha"), LPGENT("Hausa") }, - { _T("he"), LPGENT("Hebrew") }, - { _T("hz"), LPGENT("Herero") }, - { _T("hi"), LPGENT("Hindi") }, - { _T("ho"), LPGENT("Hiri Motu") }, - { _T("hu"), LPGENT("Hungarian") }, - { _T("ig"), LPGENT("Igbo") }, - { _T("is"), LPGENT("Icelandic") }, - { _T("io"), LPGENT("Ido") }, - { _T("ii"), LPGENT("Sichuan Yi") }, - { _T("iu"), LPGENT("Inuktitut") }, - { _T("ie"), LPGENT("Interlingue") }, - { _T("ia"), LPGENT("Interlingua (International Auxiliary Language Association)") }, - { _T("id"), LPGENT("Indonesian") }, - { _T("ik"), LPGENT("Inupiaq") }, - { _T("it"), LPGENT("Italian") }, - { _T("jv"), LPGENT("Javanese") }, - { _T("ja"), LPGENT("Japanese") }, - { _T("kl"), LPGENT("Kalaallisut; Greenlandic") }, - { _T("kn"), LPGENT("Kannada") }, - { _T("ks"), LPGENT("Kashmiri") }, - { _T("kr"), LPGENT("Kanuri") }, - { _T("kk"), LPGENT("Kazakh") }, - { _T("km"), LPGENT("Central Khmer") }, - { _T("ki"), LPGENT("Kikuyu; Gikuyu") }, - { _T("rw"), LPGENT("Kinyarwanda") }, - { _T("ky"), LPGENT("Kirghiz; Kyrgyz") }, - { _T("kv"), LPGENT("Komi") }, - { _T("kg"), LPGENT("Kongo") }, - { _T("ko"), LPGENT("Korean") }, - { _T("kj"), LPGENT("Kuanyama; Kwanyama") }, - { _T("ku"), LPGENT("Kurdish") }, - { _T("lo"), LPGENT("Lao") }, - { _T("la"), LPGENT("Latin") }, - { _T("lv"), LPGENT("Latvian") }, - { _T("li"), LPGENT("Limburgan; Limburger; Limburgish") }, - { _T("ln"), LPGENT("Lingala") }, - { _T("lt"), LPGENT("Lithuanian") }, - { _T("lb"), LPGENT("Luxembourgish; Letzeburgesch") }, - { _T("lu"), LPGENT("Luba-Katanga") }, - { _T("lg"), LPGENT("Ganda") }, - { _T("mk"), LPGENT("Macedonian") }, - { _T("mh"), LPGENT("Marshallese") }, - { _T("ml"), LPGENT("Malayalam") }, - { _T("mi"), LPGENT("Maori") }, - { _T("mr"), LPGENT("Marathi") }, - { _T("ms"), LPGENT("Malay") }, - { _T("mg"), LPGENT("Malagasy") }, - { _T("mt"), LPGENT("Maltese") }, - { _T("mo"), LPGENT("Moldavian") }, - { _T("mn"), LPGENT("Mongolian") }, - { _T("na"), LPGENT("Nauru") }, - { _T("nv"), LPGENT("Navajo; Navaho") }, - { _T("nr"), LPGENT("Ndebele, South; South Ndebele") }, - { _T("nd"), LPGENT("Ndebele, North; North Ndebele") }, - { _T("ng"), LPGENT("Ndonga") }, - { _T("ne"), LPGENT("Nepali") }, - { _T("nn"), LPGENT("Norwegian Nynorsk; Nynorsk, Norwegian") }, - { _T("nb"), LPGENT("Bokmaal, Norwegian; Norwegian Bokmaal") }, - { _T("no"), LPGENT("Norwegian") }, - { _T("ny"), LPGENT("Chichewa; Chewa; Nyanja") }, - { _T("oc"), LPGENT("Occitan (post 1500); Provencal") }, - { _T("oj"), LPGENT("Ojibwa") }, - { _T("or"), LPGENT("Oriya") }, - { _T("om"), LPGENT("Oromo") }, - { _T("os"), LPGENT("Ossetian; Ossetic") }, - { _T("pa"), LPGENT("Panjabi; Punjabi") }, - { _T("fa"), LPGENT("Persian") }, - { _T("pi"), LPGENT("Pali") }, - { _T("pl"), LPGENT("Polish") }, - { _T("pt"), LPGENT("Portuguese") }, - { _T("ps"), LPGENT("Pushto") }, - { _T("qu"), LPGENT("Quechua") }, - { _T("rm"), LPGENT("Romansh") }, - { _T("ro"), LPGENT("Romanian") }, - { _T("rn"), LPGENT("Rundi") }, - { _T("ru"), LPGENT("Russian") }, - { _T("sg"), LPGENT("Sango") }, - { _T("sa"), LPGENT("Sanskrit") }, - { _T("sr"), LPGENT("Serbian") }, - { _T("hr"), LPGENT("Croatian") }, - { _T("si"), LPGENT("Sinhala; Sinhalese") }, - { _T("sk"), LPGENT("Slovak") }, - { _T("sl"), LPGENT("Slovenian") }, - { _T("se"), LPGENT("Northern Sami") }, - { _T("sm"), LPGENT("Samoan") }, - { _T("sn"), LPGENT("Shona") }, - { _T("sd"), LPGENT("Sindhi") }, - { _T("so"), LPGENT("Somali") }, - { _T("st"), LPGENT("Sotho, Southern") }, - { _T("es"), LPGENT("Spanish; Castilian") }, - { _T("sc"), LPGENT("Sardinian") }, - { _T("ss"), LPGENT("Swati") }, - { _T("su"), LPGENT("Sundanese") }, - { _T("sw"), LPGENT("Swahili") }, - { _T("sv"), LPGENT("Swedish") }, - { _T("ty"), LPGENT("Tahitian") }, - { _T("ta"), LPGENT("Tamil") }, - { _T("tt"), LPGENT("Tatar") }, - { _T("te"), LPGENT("Telugu") }, - { _T("tg"), LPGENT("Tajik") }, - { _T("tl"), LPGENT("Tagalog") }, - { _T("th"), LPGENT("Thai") }, - { _T("bo"), LPGENT("Tibetan") }, - { _T("ti"), LPGENT("Tigrinya") }, - { _T("to"), LPGENT("Tonga (Tonga Islands)") }, - { _T("tn"), LPGENT("Tswana") }, - { _T("ts"), LPGENT("Tsonga") }, - { _T("tk"), LPGENT("Turkmen") }, - { _T("tr"), LPGENT("Turkish") }, - { _T("tw"), LPGENT("Twi") }, - { _T("ug"), LPGENT("Uighur; Uyghur") }, - { _T("uk"), LPGENT("Ukrainian") }, - { _T("ur"), LPGENT("Urdu") }, - { _T("uz"), LPGENT("Uzbek") }, - { _T("ve"), LPGENT("Venda") }, - { _T("vi"), LPGENT("Vietnamese") }, - { _T("vo"), LPGENT("Volapuk") }, - { _T("cy"), LPGENT("Welsh") }, - { _T("wa"), LPGENT("Walloon") }, - { _T("wo"), LPGENT("Wolof") }, - { _T("xh"), LPGENT("Xhosa") }, - { _T("yi"), LPGENT("Yiddish") }, - { _T("yo"), LPGENT("Yoruba") }, - { _T("za"), LPGENT("Zhuang; Chuang") }, - { _T("zu"), LPGENT("Zulu") }, - { NULL, NULL } + { _T("aa"), LPGENT("Afar") }, + { _T("ab"), LPGENT("Abkhazian") }, + { _T("af"), LPGENT("Afrikaans") }, + { _T("ak"), LPGENT("Akan") }, + { _T("sq"), LPGENT("Albanian") }, + { _T("am"), LPGENT("Amharic") }, + { _T("ar"), LPGENT("Arabic") }, + { _T("an"), LPGENT("Aragonese") }, + { _T("hy"), LPGENT("Armenian") }, + { _T("as"), LPGENT("Assamese") }, + { _T("av"), LPGENT("Avaric") }, + { _T("ae"), LPGENT("Avestan") }, + { _T("ay"), LPGENT("Aymara") }, + { _T("az"), LPGENT("Azerbaijani") }, + { _T("ba"), LPGENT("Bashkir") }, + { _T("bm"), LPGENT("Bambara") }, + { _T("eu"), LPGENT("Basque") }, + { _T("be"), LPGENT("Belarusian") }, + { _T("bn"), LPGENT("Bengali") }, + { _T("bh"), LPGENT("Bihari") }, + { _T("bi"), LPGENT("Bislama") }, + { _T("bs"), LPGENT("Bosnian") }, + { _T("br"), LPGENT("Breton") }, + { _T("bg"), LPGENT("Bulgarian") }, + { _T("my"), LPGENT("Burmese") }, + { _T("ca"), LPGENT("Catalan; Valencian") }, + { _T("ch"), LPGENT("Chamorro") }, + { _T("ce"), LPGENT("Chechen") }, + { _T("zh"), LPGENT("Chinese") }, + { _T("cu"), LPGENT("Church Slavic; Old Slavonic") }, + { _T("cv"), LPGENT("Chuvash") }, + { _T("kw"), LPGENT("Cornish") }, + { _T("co"), LPGENT("Corsican") }, + { _T("cr"), LPGENT("Cree") }, + { _T("cs"), LPGENT("Czech") }, + { _T("da"), LPGENT("Danish") }, + { _T("dv"), LPGENT("Divehi; Dhivehi; Maldivian") }, + { _T("nl"), LPGENT("Dutch; Flemish") }, + { _T("dz"), LPGENT("Dzongkha") }, + { _T("en"), LPGENT("English") }, + { _T("eo"), LPGENT("Esperanto") }, + { _T("et"), LPGENT("Estonian") }, + { _T("ee"), LPGENT("Ewe") }, + { _T("fo"), LPGENT("Faroese") }, + { _T("fj"), LPGENT("Fijian") }, + { _T("fi"), LPGENT("Finnish") }, + { _T("fr"), LPGENT("French") }, + { _T("fy"), LPGENT("Western Frisian") }, + { _T("ff"), LPGENT("Fulah") }, + { _T("ka"), LPGENT("Georgian") }, + { _T("de"), LPGENT("German") }, + { _T("gd"), LPGENT("Gaelic; Scottish Gaelic") }, + { _T("ga"), LPGENT("Irish") }, + { _T("gl"), LPGENT("Galician") }, + { _T("gv"), LPGENT("Manx") }, + { _T("el"), LPGENT("Greek, Modern (1453-)") }, + { _T("gn"), LPGENT("Guarani") }, + { _T("gu"), LPGENT("Gujarati") }, + { _T("ht"), LPGENT("Haitian; Haitian Creole") }, + { _T("ha"), LPGENT("Hausa") }, + { _T("he"), LPGENT("Hebrew") }, + { _T("hz"), LPGENT("Herero") }, + { _T("hi"), LPGENT("Hindi") }, + { _T("ho"), LPGENT("Hiri Motu") }, + { _T("hu"), LPGENT("Hungarian") }, + { _T("ig"), LPGENT("Igbo") }, + { _T("is"), LPGENT("Icelandic") }, + { _T("io"), LPGENT("Ido") }, + { _T("ii"), LPGENT("Sichuan Yi") }, + { _T("iu"), LPGENT("Inuktitut") }, + { _T("ie"), LPGENT("Interlingue") }, + { _T("ia"), LPGENT("Interlingua (International Auxiliary Language Association)") }, + { _T("id"), LPGENT("Indonesian") }, + { _T("ik"), LPGENT("Inupiaq") }, + { _T("it"), LPGENT("Italian") }, + { _T("jv"), LPGENT("Javanese") }, + { _T("ja"), LPGENT("Japanese") }, + { _T("kl"), LPGENT("Kalaallisut; Greenlandic") }, + { _T("kn"), LPGENT("Kannada") }, + { _T("ks"), LPGENT("Kashmiri") }, + { _T("kr"), LPGENT("Kanuri") }, + { _T("kk"), LPGENT("Kazakh") }, + { _T("km"), LPGENT("Central Khmer") }, + { _T("ki"), LPGENT("Kikuyu; Gikuyu") }, + { _T("rw"), LPGENT("Kinyarwanda") }, + { _T("ky"), LPGENT("Kirghiz; Kyrgyz") }, + { _T("kv"), LPGENT("Komi") }, + { _T("kg"), LPGENT("Kongo") }, + { _T("ko"), LPGENT("Korean") }, + { _T("kj"), LPGENT("Kuanyama; Kwanyama") }, + { _T("ku"), LPGENT("Kurdish") }, + { _T("lo"), LPGENT("Lao") }, + { _T("la"), LPGENT("Latin") }, + { _T("lv"), LPGENT("Latvian") }, + { _T("li"), LPGENT("Limburgan; Limburger; Limburgish") }, + { _T("ln"), LPGENT("Lingala") }, + { _T("lt"), LPGENT("Lithuanian") }, + { _T("lb"), LPGENT("Luxembourgish; Letzeburgesch") }, + { _T("lu"), LPGENT("Luba-Katanga") }, + { _T("lg"), LPGENT("Ganda") }, + { _T("mk"), LPGENT("Macedonian") }, + { _T("mh"), LPGENT("Marshallese") }, + { _T("ml"), LPGENT("Malayalam") }, + { _T("mi"), LPGENT("Maori") }, + { _T("mr"), LPGENT("Marathi") }, + { _T("ms"), LPGENT("Malay") }, + { _T("mg"), LPGENT("Malagasy") }, + { _T("mt"), LPGENT("Maltese") }, + { _T("mo"), LPGENT("Moldavian") }, + { _T("mn"), LPGENT("Mongolian") }, + { _T("na"), LPGENT("Nauru") }, + { _T("nv"), LPGENT("Navajo; Navaho") }, + { _T("nr"), LPGENT("Ndebele, South; South Ndebele") }, + { _T("nd"), LPGENT("Ndebele, North; North Ndebele") }, + { _T("ng"), LPGENT("Ndonga") }, + { _T("ne"), LPGENT("Nepali") }, + { _T("nn"), LPGENT("Norwegian Nynorsk; Nynorsk, Norwegian") }, + { _T("nb"), LPGENT("Bokmaal, Norwegian; Norwegian Bokmaal") }, + { _T("no"), LPGENT("Norwegian") }, + { _T("ny"), LPGENT("Chichewa; Chewa; Nyanja") }, + { _T("oc"), LPGENT("Occitan (post 1500); Provencal") }, + { _T("oj"), LPGENT("Ojibwa") }, + { _T("or"), LPGENT("Oriya") }, + { _T("om"), LPGENT("Oromo") }, + { _T("os"), LPGENT("Ossetian; Ossetic") }, + { _T("pa"), LPGENT("Panjabi; Punjabi") }, + { _T("fa"), LPGENT("Persian") }, + { _T("pi"), LPGENT("Pali") }, + { _T("pl"), LPGENT("Polish") }, + { _T("pt"), LPGENT("Portuguese") }, + { _T("ps"), LPGENT("Pushto") }, + { _T("qu"), LPGENT("Quechua") }, + { _T("rm"), LPGENT("Romansh") }, + { _T("ro"), LPGENT("Romanian") }, + { _T("rn"), LPGENT("Rundi") }, + { _T("ru"), LPGENT("Russian") }, + { _T("sg"), LPGENT("Sango") }, + { _T("sa"), LPGENT("Sanskrit") }, + { _T("sr"), LPGENT("Serbian") }, + { _T("hr"), LPGENT("Croatian") }, + { _T("si"), LPGENT("Sinhala; Sinhalese") }, + { _T("sk"), LPGENT("Slovak") }, + { _T("sl"), LPGENT("Slovenian") }, + { _T("se"), LPGENT("Northern Sami") }, + { _T("sm"), LPGENT("Samoan") }, + { _T("sn"), LPGENT("Shona") }, + { _T("sd"), LPGENT("Sindhi") }, + { _T("so"), LPGENT("Somali") }, + { _T("st"), LPGENT("Sotho, Southern") }, + { _T("es"), LPGENT("Spanish; Castilian") }, + { _T("sc"), LPGENT("Sardinian") }, + { _T("ss"), LPGENT("Swati") }, + { _T("su"), LPGENT("Sundanese") }, + { _T("sw"), LPGENT("Swahili") }, + { _T("sv"), LPGENT("Swedish") }, + { _T("ty"), LPGENT("Tahitian") }, + { _T("ta"), LPGENT("Tamil") }, + { _T("tt"), LPGENT("Tatar") }, + { _T("te"), LPGENT("Telugu") }, + { _T("tg"), LPGENT("Tajik") }, + { _T("tl"), LPGENT("Tagalog") }, + { _T("th"), LPGENT("Thai") }, + { _T("bo"), LPGENT("Tibetan") }, + { _T("ti"), LPGENT("Tigrinya") }, + { _T("to"), LPGENT("Tonga (Tonga Islands)") }, + { _T("tn"), LPGENT("Tswana") }, + { _T("ts"), LPGENT("Tsonga") }, + { _T("tk"), LPGENT("Turkmen") }, + { _T("tr"), LPGENT("Turkish") }, + { _T("tw"), LPGENT("Twi") }, + { _T("ug"), LPGENT("Uighur; Uyghur") }, + { _T("uk"), LPGENT("Ukrainian") }, + { _T("ur"), LPGENT("Urdu") }, + { _T("uz"), LPGENT("Uzbek") }, + { _T("ve"), LPGENT("Venda") }, + { _T("vi"), LPGENT("Vietnamese") }, + { _T("vo"), LPGENT("Volapuk") }, + { _T("cy"), LPGENT("Welsh") }, + { _T("wa"), LPGENT("Walloon") }, + { _T("wo"), LPGENT("Wolof") }, + { _T("xh"), LPGENT("Xhosa") }, + { _T("yi"), LPGENT("Yiddish") }, + { _T("yo"), LPGENT("Yoruba") }, + { _T("za"), LPGENT("Zhuang; Chuang") }, + { _T("zu"), LPGENT("Zulu") }, + { NULL, NULL } }; -class CJabberDlgRegister: public CJabberDlgBase +class CJabberDlgRegister : public CJabberDlgBase { typedef CJabberDlgBase CSuper; public: - CJabberDlgRegister(CJabberProto *proto, HWND hwndParent, JABBER_CONN_DATA *regInfo): + CJabberDlgRegister(CJabberProto *proto, HWND hwndParent, JABBER_CONN_DATA *regInfo) : CJabberDlgBase(proto, IDD_OPT_REGISTER, false), m_bProcessStarted(false), m_regInfo(regInfo), @@ -296,7 +296,7 @@ private: ///////////////////////////////////////////////////////////////////////////////////////// // JabberOptDlgProc - main options dialog procedure -class CCtrlEditJid: public CCtrlEdit +class CCtrlEditJid : public CCtrlEdit { typedef CCtrlEdit CSuper; @@ -312,10 +312,8 @@ public: protected: virtual LRESULT CustomWndProc(UINT msg, WPARAM wParam, LPARAM lParam) { - if (msg == WM_CHAR) - { - switch(wParam) - { + if (msg == WM_CHAR) { + switch (wParam) { case '\"': case '&': case '\'': case '/': case ':': case '<': case '>': case '@': MessageBeep(MB_ICONASTERISK); @@ -336,7 +334,7 @@ static void sttStoreJidFromUI(CJabberProto *ppro, CCtrlEdit &txtUsername, CCtrlC ppro->setTString("jid", CMString(FORMAT, _T("%s@%s"), ptrT(txtUsername.GetText()), ptrT(cbServer.GetText()))); } -class CDlgOptAccount: public CJabberDlgBase +class CDlgOptAccount : public CJabberDlgBase { typedef CJabberDlgBase CSuper; @@ -364,14 +362,14 @@ class CDlgOptAccount: public CJabberDlgBase CCtrlHyperlink m_lnkServers; public: - CDlgOptAccount(CJabberProto *proto): + CDlgOptAccount(CJabberProto *proto) : CJabberDlgBase(proto, IDD_OPT_JABBER, false), m_txtUsername(this, IDC_EDIT_USERNAME), m_txtPassword(this, IDC_EDIT_PASSWORD), m_txtPriority(this, IDC_PRIORITY), m_chkSavePassword(this, IDC_SAVEPASSWORD), m_cbResource(this, IDC_COMBO_RESOURCE), - m_chkUseHostnameAsResource(this,IDC_HOSTNAME_AS_RESOURCE), + m_chkUseHostnameAsResource(this, IDC_HOSTNAME_AS_RESOURCE), m_chkUseDomainLogin(this, IDC_USEDOMAINLOGIN), m_cbServer(this, IDC_EDIT_LOGIN_SERVER), m_txtPort(this, IDC_PORT), @@ -437,16 +435,16 @@ protected: // fill predefined resources TCHAR *szResources[] = { _T("Home"), _T("Work"), _T("Office"), _T("Miranda") }; - for (int i=0; i < _countof(szResources); i++) + for (int i = 0; i < _countof(szResources); i++) m_cbResource.AddString(szResources[i]); // append computer name to the resource list - TCHAR szCompName[ MAX_COMPUTERNAME_LENGTH + 1]; + TCHAR szCompName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD dwCompNameLength = MAX_COMPUTERNAME_LENGTH; if (GetComputerName(szCompName, &dwCompNameLength)) m_cbResource.AddString(szCompName); - ptrT tszResource( m_proto->getTStringA("Resource")); + ptrT tszResource(m_proto->getTStringA("Resource")); if (tszResource != NULL) { if (CB_ERR == m_cbResource.FindString(tszResource, -1, true)) m_cbResource.AddString(tszResource); @@ -454,7 +452,7 @@ protected: } else m_cbResource.SetText(_T("Miranda")); - for (int i=0; g_LanguageCodes[i].szCode; i++) { + for (int i = 0; g_LanguageCodes[i].szCode; i++) { int iItem = m_cbLocale.AddString(TranslateTS(g_LanguageCodes[i].szDescription), (LPARAM)g_LanguageCodes[i].szCode); if (!mir_tstrcmp(m_proto->m_tszSelectedLang, g_LanguageCodes[i].szCode)) m_cbLocale.SetCurSel(iItem); @@ -497,18 +495,18 @@ protected: mir_free(m_proto->m_tszSelectedLang); m_proto->m_tszSelectedLang = mir_tstrdup(szLanguageCode); - } } + } + } sttStoreJidFromUI(m_proto, m_txtUsername, m_cbServer); if (m_proto->m_bJabberOnline) { if (m_txtUsername.IsChanged() || m_txtPassword.IsChanged() || m_cbResource.IsChanged() || m_cbServer.IsChanged() || m_chkUseHostnameAsResource.IsChanged() || m_txtPort.IsChanged() || - m_txtManualHost.IsChanged() || m_txtManualPort.IsChanged() || m_cbLocale.IsChanged()) - { + m_txtManualHost.IsChanged() || m_txtManualPort.IsChanged() || m_cbLocale.IsChanged()) { MessageBox(m_hwnd, TranslateT("These changes will take effect the next time you connect to the Jabber network."), - TranslateT("Jabber Protocol Option"), MB_OK|MB_SETFOREGROUND); + TranslateT("Jabber Protocol Option"), MB_OK | MB_SETFOREGROUND); } m_proto->SendPresence(m_proto->m_iStatus, true); @@ -541,7 +539,7 @@ private: void btnRegister_OnClick(CCtrlButton *) { - PSHNOTIFY pshn = {0}; + PSHNOTIFY pshn = { 0 }; pshn.hdr.code = PSN_APPLY; pshn.hdr.hwndFrom = m_hwnd; SendMessage(m_hwnd, WM_NOTIFY, 0, (LPARAM)&pshn); @@ -573,8 +571,8 @@ private: if (res == IDYES) m_proto->m_ThreadInfo->send( - XmlNodeIq(_T("set"), m_proto->SerialNext(), m_proto->m_szJabberJID) << XQUERY(JABBER_FEAT_REGISTER) - << XCHILD(_T("remove"))); + XmlNodeIq(_T("set"), m_proto->SerialNext(), m_proto->m_szJabberJID) << XQUERY(JABBER_FEAT_REGISTER) + << XCHILD(_T("remove"))); } void btnChangePassword_OnClick(CCtrlButton *) @@ -694,7 +692,7 @@ private: m_cbServer.ResetContent(); if (node) { - for (int i=0; ; i++) { + for (int i = 0;; i++) { HXML n = XmlGetChild(node, i); if (!n) break; @@ -702,7 +700,7 @@ private: if (!mir_tstrcmp(XmlGetName(n), _T("item"))) if (const TCHAR *jid = XmlGetAttrValue(n, _T("jid"))) if (m_cbServer.FindString(jid, -1, true) == CB_ERR) - m_cbServer.AddString(jid); + m_cbServer.AddString(jid); } } @@ -720,7 +718,7 @@ private: if (!IsWindow(hwnd)) return; - NETLIBHTTPREQUEST request = {0}; + NETLIBHTTPREQUEST request = { 0 }; request.cbSize = sizeof(request); request.requestType = REQUEST_GET; request.flags = NLHRF_REDIRECT | NLHRF_HTTP11; @@ -749,7 +747,7 @@ private: ///////////////////////////////////////////////////////////////////////////////////////// // JabberAdvOptDlgProc - advanced options dialog procedure -class CDlgOptAdvanced: public CJabberDlgBase +class CDlgOptAdvanced : public CJabberDlgBase { typedef CJabberDlgBase CSuper; @@ -780,7 +778,7 @@ public: CreateLink(m_txtProxy, "BsProxyServer", _T("")); m_chkDirect.OnChange = - m_chkDirectManual.OnChange = Callback(this, &CDlgOptAdvanced::chkDirect_OnChange); + m_chkDirectManual.OnChange = Callback(this, &CDlgOptAdvanced::chkDirect_OnChange); m_chkProxy.OnChange = Callback(this, &CDlgOptAdvanced::chkProxy_OnChange); m_otvOptions.AddOption(LPGENT("Messaging") _T("/") LPGENT("Send messages slower, but with full acknowledgment"), m_proto->m_options.MsgAck); @@ -839,10 +837,13 @@ public: if (bChecked) { if (item->getTemp()->m_iStatus != m_proto->getWord(hContact, "Status", ID_STATUS_OFFLINE)) { m_proto->setWord(hContact, "Status", (WORD)item->getTemp()->m_iStatus); - } } + } + } else if (m_proto->getWord(hContact, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) m_proto->setWord(hContact, "Status", ID_STATUS_OFFLINE); - } } } + } + } + } } m_proto->SendPresence(m_proto->m_iStatus, true); @@ -876,7 +877,7 @@ public: ///////////////////////////////////////////////////////////////////////////////////////// // JabberGcOptDlgProc - chat options dialog procedure -class CDlgOptGc: public CJabberDlgBase +class CDlgOptGc : public CJabberDlgBase { typedef CJabberDlgBase CSuper; @@ -886,7 +887,7 @@ class CDlgOptGc: public CJabberDlgBase CCtrlTreeOpts m_otvOptions; public: - CDlgOptGc(CJabberProto *proto): + CDlgOptGc(CJabberProto *proto) : CJabberDlgBase(proto, IDD_OPT_JABBER4, false), m_txtAltNick(this, IDC_TXT_ALTNICK), m_txtSlap(this, IDC_TXT_SLAP), @@ -919,7 +920,8 @@ public: #define JM_STATUSCHANGED WM_USER+0x0001 #define fopent(name, mode) _wfopen(name, mode) -enum { +enum +{ RRA_FILLLIST = 0, RRA_SYNCROSTER, RRA_SYNCDONE @@ -934,7 +936,7 @@ struct ROSTEREDITDAT static int _RosterInsertListItem(HWND hList, const TCHAR * jid, const TCHAR * nick, const TCHAR * group, const TCHAR * subscr, BOOL bChecked) { - LVITEM item = {0}; + LVITEM item = { 0 }; item.mask = LVIF_TEXT | LVIF_STATE; item.iItem = ListView_GetItemCount(hList); item.pszText = (TCHAR*)jid; @@ -959,9 +961,9 @@ static void _RosterListClear(HWND hwndDlg) return; ListView_DeleteAllItems(hList); - while ( ListView_DeleteColumn(hList, 0)); + while (ListView_DeleteColumn(hList, 0)); - LV_COLUMN column = {0}; + LV_COLUMN column = { 0 }; column.mask = LVCF_TEXT; column.cx = 500; @@ -979,12 +981,12 @@ static void _RosterListClear(HWND hwndDlg) RECT rc; GetClientRect(hList, &rc); - int width = rc.right-rc.left; + int width = rc.right - rc.left; - ListView_SetColumnWidth(hList, 0, width*40/100); - ListView_SetColumnWidth(hList, 1, width*25/100); - ListView_SetColumnWidth(hList, 2, width*20/100); - ListView_SetColumnWidth(hList, 3, width*10/100); + ListView_SetColumnWidth(hList, 0, width * 40 / 100); + ListView_SetColumnWidth(hList, 1, width * 25 / 100); + ListView_SetColumnWidth(hList, 2, width * 20 / 100); + ListView_SetColumnWidth(hList, 3, width * 10 / 100); } void CJabberProto::_RosterHandleGetRequest(HXML node, CJabberIqInfo*) @@ -992,7 +994,7 @@ void CJabberProto::_RosterHandleGetRequest(HXML node, CJabberIqInfo*) HWND hList = GetDlgItem(rrud.hwndDlg, IDC_ROSTER); if (rrud.bRRAction == RRA_FILLLIST) { _RosterListClear(rrud.hwndDlg); - HXML query = XmlGetChild(node , "query"); + HXML query = XmlGetChild(node, "query"); if (query == NULL) return; int i = 1; while (TRUE) { @@ -1006,17 +1008,17 @@ void CJabberProto::_RosterHandleGetRequest(HXML node, CJabberIqInfo*) const TCHAR *name = XmlGetAttrValue(item, _T("name")); const TCHAR *subscription = XmlGetAttrValue(item, _T("subscription")); - const TCHAR *group = XmlGetText( XmlGetChild(item, "group")); + const TCHAR *group = XmlGetText(XmlGetChild(item, "group")); _RosterInsertListItem(hList, jid, name, group, subscription, TRUE); } // now it is require to process whole contact list to add not in roster contacts for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) { - ptrT tszJid( getTStringA(hContact, "jid")); + ptrT tszJid(getTStringA(hContact, "jid")); if (tszJid == NULL) continue; - LVFINDINFO lvfi = {0}; + LVFINDINFO lvfi = { 0 }; lvfi.flags = LVFI_STRING; lvfi.psz = tszJid; TCHAR *p = _tcschr(tszJid, _T('@')); @@ -1024,9 +1026,9 @@ void CJabberProto::_RosterHandleGetRequest(HXML node, CJabberIqInfo*) p = _tcschr(tszJid, _T('/')); if (p) *p = 0; } - if ( ListView_FindItem(hList, -1, &lvfi) == -1) { - ptrT tszName( db_get_tsa(hContact, "CList", "MyHandle")); - ptrT tszGroup( db_get_tsa(hContact, "CList", "Group")); + if (ListView_FindItem(hList, -1, &lvfi) == -1) { + ptrT tszName(db_get_tsa(hContact, "CList", "MyHandle")); + ptrT tszGroup(db_get_tsa(hContact, "CList", "Group")); _RosterInsertListItem(hList, tszJid, tszName, tszGroup, NULL, FALSE); } } @@ -1037,50 +1039,50 @@ void CJabberProto::_RosterHandleGetRequest(HXML node, CJabberIqInfo*) SendMessage(rrud.hwndDlg, JM_STATUSCHANGED, 0, 0); return; } - + if (rrud.bRRAction == RRA_SYNCROSTER) { SetDlgItemText(rrud.hwndDlg, IDC_UPLOAD, TranslateT("Uploading...")); - HXML queryRoster = XmlGetChild(node , "query"); + HXML queryRoster = XmlGetChild(node, "query"); if (!queryRoster) return; - XmlNodeIq iq( AddIQ(&CJabberProto::_RosterHandleGetRequest, JABBER_IQ_TYPE_SET)); + XmlNodeIq iq(AddIQ(&CJabberProto::_RosterHandleGetRequest, JABBER_IQ_TYPE_SET)); HXML query = iq << XCHILDNS(_T("query"), JABBER_FEAT_IQ_ROSTER); - int itemCount=0; - int ListItemCount=ListView_GetItemCount(hList); - for (int index=0; index < ListItemCount; index++) { - TCHAR jid[JABBER_MAX_JID_LEN]=_T(""); - TCHAR name[260]=_T(""); - TCHAR group[260]=_T(""); - TCHAR subscr[260]=_T(""); + int itemCount = 0; + int ListItemCount = ListView_GetItemCount(hList); + for (int index = 0; index < ListItemCount; index++) { + TCHAR jid[JABBER_MAX_JID_LEN] = _T(""); + TCHAR name[260] = _T(""); + TCHAR group[260] = _T(""); + TCHAR subscr[260] = _T(""); ListView_GetItemText(hList, index, 0, jid, _countof(jid)); ListView_GetItemText(hList, index, 1, name, _countof(name)); ListView_GetItemText(hList, index, 2, group, _countof(group)); ListView_GetItemText(hList, index, 3, subscr, _countof(subscr)); HXML itemRoster = XmlGetChildByTag(queryRoster, "item", "jid", jid); - BOOL bRemove = !ListView_GetCheckState(hList,index); + BOOL bRemove = !ListView_GetCheckState(hList, index); if (itemRoster && bRemove) { //delete item - query << XCHILD(_T("item")) << XATTR(_T("jid"), jid) << XATTR(_T("subscription") ,_T("remove")); + query << XCHILD(_T("item")) << XATTR(_T("jid"), jid) << XATTR(_T("subscription"), _T("remove")); itemCount++; } else if (!bRemove) { BOOL bPushed = itemRoster ? TRUE : FALSE; if (!bPushed) { const TCHAR *rosterName = XmlGetAttrValue(itemRoster, _T("name")); - if ((rosterName != NULL || name[0]!=0) && mir_tstrcmpi(rosterName,name)) - bPushed=TRUE; + if ((rosterName != NULL || name[0] != 0) && mir_tstrcmpi(rosterName, name)) + bPushed = TRUE; if (!bPushed) { rosterName = XmlGetAttrValue(itemRoster, _T("subscription")); - if ((rosterName != NULL || subscr[0]!=0) && mir_tstrcmpi(rosterName,subscr)) - bPushed=TRUE; + if ((rosterName != NULL || subscr[0] != 0) && mir_tstrcmpi(rosterName, subscr)) + bPushed = TRUE; } if (!bPushed) { - const TCHAR *rosterGroup = XmlGetText( XmlGetChild(itemRoster, "group")); - if ((rosterGroup != NULL || group[0]!=0) && mir_tstrcmpi(rosterGroup,group)) - bPushed=TRUE; + const TCHAR *rosterGroup = XmlGetText(XmlGetChild(itemRoster, "group")); + if ((rosterGroup != NULL || group[0] != 0) && mir_tstrcmpi(rosterGroup, group)) + bPushed = TRUE; } } if (bPushed) { @@ -1113,21 +1115,20 @@ void CJabberProto::_RosterSendRequest(HWND hwndDlg, BYTE rrAction) { rrud.bRRAction = rrAction; rrud.hwndDlg = hwndDlg; - + m_ThreadInfo->send( - XmlNodeIq( AddIQ(&CJabberProto::_RosterHandleGetRequest, JABBER_IQ_TYPE_GET)) - << XCHILDNS(_T("query"), JABBER_FEAT_IQ_ROSTER)); + XmlNodeIq(AddIQ(&CJabberProto::_RosterHandleGetRequest, JABBER_IQ_TYPE_GET)) + << XCHILDNS(_T("query"), JABBER_FEAT_IQ_ROSTER)); } static void _RosterItemEditEnd(HWND hEditor, ROSTEREDITDAT * edat, BOOL bCancel) { - if (!bCancel) - { + if (!bCancel) { int len = GetWindowTextLength(hEditor) + 1; - TCHAR *buff=(TCHAR*)mir_alloc(len*sizeof(TCHAR)); + TCHAR *buff = (TCHAR*)mir_alloc(len*sizeof(TCHAR)); if (buff) { - GetWindowText(hEditor,buff,len); - ListView_SetItemText(edat->hList,edat->index, edat->subindex,buff); + GetWindowText(hEditor, buff, len); + ListView_SetItemText(edat->hList, edat->index, edat->subindex, buff); } mir_free(buff); } @@ -1136,11 +1137,11 @@ static void _RosterItemEditEnd(HWND hEditor, ROSTEREDITDAT * edat, BOOL bCancel) static LRESULT CALLBACK _RosterItemNewEditProc(HWND hEditor, UINT msg, WPARAM wParam, LPARAM lParam) { - ROSTEREDITDAT * edat = (ROSTEREDITDAT *) GetWindowLongPtr(hEditor,GWLP_USERDATA); + ROSTEREDITDAT * edat = (ROSTEREDITDAT *)GetWindowLongPtr(hEditor, GWLP_USERDATA); if (!edat) return 0; - switch(msg) { + switch (msg) { case WM_KEYDOWN: - switch(wParam) { + switch (wParam) { case VK_RETURN: _RosterItemEditEnd(hEditor, edat, FALSE); return 0; @@ -1153,8 +1154,8 @@ static LRESULT CALLBACK _RosterItemNewEditProc(HWND hEditor, UINT msg, WPARAM wP case WM_GETDLGCODE: if (lParam) { MSG *msg2 = (MSG*)lParam; - if (msg2->message==WM_KEYDOWN && msg2->wParam==VK_TAB) return 0; - if (msg2->message==WM_CHAR && msg2->wParam=='\t') return 0; + if (msg2->message == WM_KEYDOWN && msg2->wParam == VK_TAB) return 0; + if (msg2->message == WM_CHAR && msg2->wParam == '\t') return 0; } return DLGC_WANTMESSAGE; @@ -1163,11 +1164,11 @@ static LRESULT CALLBACK _RosterItemNewEditProc(HWND hEditor, UINT msg, WPARAM wP return 0; case WM_DESTROY: - SetWindowLongPtr(hEditor, GWLP_USERDATA, (LONG_PTR) 0); + SetWindowLongPtr(hEditor, GWLP_USERDATA, (LONG_PTR)0); free(edat); return 0; } - + return mir_callNextSubclass(hEditor, _RosterItemNewEditProc, msg, wParam, lParam); } @@ -1189,7 +1190,7 @@ void CJabberProto::_RosterExportToFile(HWND hwndDlg) ofn.lpstrDefExt = _T("xml"); if (!GetSaveFileName(&ofn)) return; - FILE * fp = fopent(filename,_T("w")); + FILE * fp = fopent(filename, _T("w")); if (!fp) return; HWND hList = GetDlgItem(hwndDlg, IDC_ROSTER); int ListItemCount = ListView_GetItemCount(hList); @@ -1205,12 +1206,11 @@ void CJabberProto::_RosterExportToFile(HWND hwndDlg) HXML table = root << XCHILD(_T("Worksheet")) << XATTR(_T("ss:Name"), _T("Exported roster")) << XCHILD(_T("Table")); - for (int index=0; indexhList=hList; - edat->index=lvhti.iItem; - edat->subindex=lvhti.iSubItem; - SetWindowLongPtr(hEditor,GWLP_USERDATA,(LONG_PTR)edat); + edat->hList = hList; + edat->index = lvhti.iItem; + edat->subindex = lvhti.iSubItem; + SetWindowLongPtr(hEditor, GWLP_USERDATA, (LONG_PTR)edat); } } return mir_callNextSubclass(hList, _RosterNewListProc, msg, wParam, lParam); @@ -1374,20 +1373,19 @@ static LRESULT CALLBACK _RosterNewListProc(HWND hList, UINT msg, WPARAM wParam, static int sttRosterEditorResizer(HWND /*hwndDlg*/, LPARAM, UTILRESIZECONTROL *urc) { - switch (urc->wId) - { + switch (urc->wId) { case IDC_HEADERBAR: - return RD_ANCHORX_LEFT|RD_ANCHORY_TOP|RD_ANCHORX_WIDTH; + return RD_ANCHORX_LEFT | RD_ANCHORY_TOP | RD_ANCHORX_WIDTH; case IDC_ROSTER: - return RD_ANCHORX_LEFT|RD_ANCHORY_TOP|RD_ANCHORY_HEIGHT|RD_ANCHORX_WIDTH; + return RD_ANCHORX_LEFT | RD_ANCHORY_TOP | RD_ANCHORY_HEIGHT | RD_ANCHORX_WIDTH; case IDC_DOWNLOAD: case IDC_UPLOAD: - return RD_ANCHORX_LEFT|RD_ANCHORY_BOTTOM; + return RD_ANCHORX_LEFT | RD_ANCHORY_BOTTOM; case IDC_EXPORT: case IDC_IMPORT: - return RD_ANCHORX_RIGHT|RD_ANCHORY_BOTTOM; + return RD_ANCHORX_RIGHT | RD_ANCHORY_BOTTOM; } - return RD_ANCHORX_LEFT|RD_ANCHORY_TOP; + return RD_ANCHORX_LEFT | RD_ANCHORY_TOP; } static INT_PTR CALLBACK JabberRosterOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) @@ -1397,7 +1395,7 @@ static INT_PTR CALLBACK JabberRosterOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wP switch (msg) { case JM_STATUSCHANGED: { - int count = ListView_GetItemCount(GetDlgItem(hwndDlg,IDC_ROSTER)); + int count = ListView_GetItemCount(GetDlgItem(hwndDlg, IDC_ROSTER)); EnableWindow(GetDlgItem(hwndDlg, IDC_DOWNLOAD), ppro->m_bJabberOnline); EnableWindow(GetDlgItem(hwndDlg, IDC_UPLOAD), count && ppro->m_bJabberOnline); EnableWindow(GetDlgItem(hwndDlg, IDC_EXPORT), count > 0); @@ -1425,8 +1423,8 @@ static INT_PTR CALLBACK JabberRosterOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wP Utils_RestoreWindowPosition(hwndDlg, NULL, ppro->m_szModuleName, "rosterCtrlWnd_"); - ListView_SetExtendedListViewStyle(GetDlgItem(hwndDlg,IDC_ROSTER), LVS_EX_CHECKBOXES | LVS_EX_BORDERSELECT /*| LVS_EX_FULLROWSELECT*/ | LVS_EX_GRIDLINES /*| LVS_EX_HEADERDRAGDROP*/); - mir_subclassWindow( GetDlgItem(hwndDlg,IDC_ROSTER), _RosterNewListProc); + ListView_SetExtendedListViewStyle(GetDlgItem(hwndDlg, IDC_ROSTER), LVS_EX_CHECKBOXES | LVS_EX_BORDERSELECT /*| LVS_EX_FULLROWSELECT*/ | LVS_EX_GRIDLINES /*| LVS_EX_HEADERDRAGDROP*/); + mir_subclassWindow(GetDlgItem(hwndDlg, IDC_ROSTER), _RosterNewListProc); _RosterListClear(hwndDlg); ppro->rrud.hwndDlg = hwndDlg; ppro->rrud.bReadyToDownload = TRUE; @@ -1452,7 +1450,7 @@ static INT_PTR CALLBACK JabberRosterOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wP case IDC_DOWNLOAD: ppro->rrud.bReadyToUpload = FALSE; ppro->rrud.bReadyToDownload = FALSE; - SendMessage(ppro->rrud.hwndDlg, JM_STATUSCHANGED,0,0); + SendMessage(ppro->rrud.hwndDlg, JM_STATUSCHANGED, 0, 0); SetDlgItemText(ppro->rrud.hwndDlg, IDC_DOWNLOAD, TranslateT("Downloading...")); ppro->_RosterSendRequest(hwndDlg, RRA_FILLLIST); break; @@ -1514,7 +1512,7 @@ int CJabberProto::OnOptionsInit(WPARAM wParam, LPARAM) /////////////////////////////////////////////////////////////////////////////// // Account manager UI -class CJabberDlgAccMgrUI: public CJabberDlgBase +class CJabberDlgAccMgrUI : public CJabberDlgBase { typedef CJabberDlgBase CSuper; @@ -1531,7 +1529,7 @@ class CJabberDlgAccMgrUI: public CJabberDlgBase CCtrlButton m_btnRegister; public: - CJabberDlgAccMgrUI(CJabberProto *proto, HWND hwndParent): + CJabberDlgAccMgrUI(CJabberProto *proto, HWND hwndParent) : CJabberDlgBase(proto, IDD_ACCMGRUI, false), m_cbType(this, IDC_CB_TYPE), m_txtUsername(this, IDC_EDIT_USERNAME), @@ -1582,16 +1580,16 @@ protected: // fill predefined resources TCHAR *szResources[] = { _T("Home"), _T("Work"), _T("Office"), _T("Miranda") }; - for (int i=0; i < _countof(szResources); i++) + for (int i = 0; i < _countof(szResources); i++) m_cbResource.AddString(szResources[i]); // append computer name to the resource list - TCHAR szCompName[ MAX_COMPUTERNAME_LENGTH + 1]; + TCHAR szCompName[MAX_COMPUTERNAME_LENGTH + 1]; DWORD dwCompNameLength = MAX_COMPUTERNAME_LENGTH; if (GetComputerName(szCompName, &dwCompNameLength)) m_cbResource.AddString(szCompName); - ptrT tszResource( m_proto->getTStringA("Resource")); + ptrT tszResource(m_proto->getTStringA("Resource")); if (tszResource != NULL) { if (CB_ERR == m_cbResource.FindString(tszResource, -1, true)) m_cbResource.AddString(tszResource); @@ -1612,9 +1610,9 @@ protected: m_cbType.AddString(TranslateT("S.ms"), ACC_SMS); m_cbType.AddString(TranslateT("Yandex"), ACC_YANDEX); - char server[256], manualServer[256]={0}; + char server[256], manualServer[256] = { 0 }; m_cbServer.GetTextA(server, _countof(server)); - ptrA dbManualServer( db_get_sa(NULL, m_proto->m_szModuleName, "ManualHost")); + ptrA dbManualServer(db_get_sa(NULL, m_proto->m_szModuleName, "ManualHost")); if (dbManualServer != NULL) mir_strncpy(manualServer, dbManualServer, _countof(manualServer)); @@ -1669,7 +1667,7 @@ protected: m_txtManualHost.Enable(); m_txtPort.Enable(); - ptrT dbManualHost( m_proto->getTStringA("ManualHost")); + ptrT dbManualHost(m_proto->getTStringA("ManualHost")); if (dbManualHost != NULL) m_txtManualHost.SetText(dbManualHost); @@ -1794,11 +1792,10 @@ protected: if (m_proto->m_bJabberOnline) { if (m_cbType.IsChanged() || m_txtPassword.IsChanged() || m_cbResource.IsChanged() || - m_cbServer.IsChanged() || m_txtPort.IsChanged() || m_txtManualHost.IsChanged()) - { + m_cbServer.IsChanged() || m_txtPort.IsChanged() || m_txtManualHost.IsChanged()) { MessageBox(m_hwnd, TranslateT("Some changes will take effect the next time you connect to the Jabber network."), - TranslateT("Jabber Protocol Option"), MB_OK|MB_SETFOREGROUND); + TranslateT("Jabber Protocol Option"), MB_OK | MB_SETFOREGROUND); } m_proto->SendPresence(m_proto->m_iStatus, true); @@ -1827,7 +1824,7 @@ private: void btnRegister_OnClick(CCtrlButton *) { - PSHNOTIFY pshn = {0}; + PSHNOTIFY pshn = { 0 }; pshn.hdr.code = PSN_APPLY; pshn.hdr.hwndFrom = m_hwnd; SendMessage(m_hwnd, WM_NOTIFY, 0, (LPARAM)&pshn); @@ -1937,18 +1934,18 @@ void CJabberDlgAccMgrUI::CheckRegistration() void CJabberDlgAccMgrUI::setupConnection(int type) { switch (type) { - case ACC_PUBLIC: setupPublic(); break; - case ACC_TLS: setupSecure(); break; - case ACC_SSL: setupSecureSSL(); break; - case ACC_GTALK: setupGoogle(); break; - case ACC_LJTALK: setupLJ(); break; - case ACC_LOL_EN: setupLOLEN(); break; - case ACC_LOL_EW: setupLOLEW(); break; - case ACC_LOL_OC: setupLOLOC(); break; - case ACC_LOL_US: setupLOLUS(); break; - case ACC_OK: setupOK(); break; - case ACC_SMS: setupSMS(); break; - case ACC_YANDEX: setupYA(); break; + case ACC_PUBLIC: setupPublic(); break; + case ACC_TLS: setupSecure(); break; + case ACC_SSL: setupSecureSSL(); break; + case ACC_GTALK: setupGoogle(); break; + case ACC_LJTALK: setupLJ(); break; + case ACC_LOL_EN: setupLOLEN(); break; + case ACC_LOL_EW: setupLOLEW(); break; + case ACC_LOL_OC: setupLOLOC(); break; + case ACC_LOL_US: setupLOLUS(); break; + case ACC_OK: setupOK(); break; + case ACC_SMS: setupSMS(); break; + case ACC_YANDEX: setupYA(); break; } } @@ -2176,9 +2173,9 @@ void CJabberDlgAccMgrUI::RefreshServers(HXML node) break; if (!mir_tstrcmp(XmlGetName(n), _T("item"))) - if (const TCHAR *jid = XmlGetAttrValue(n, _T("jid"))) - if (m_cbServer.FindString(jid, -1, true) == CB_ERR) - m_cbServer.AddString(jid); + if (const TCHAR *jid = XmlGetAttrValue(n, _T("jid"))) + if (m_cbServer.FindString(jid, -1, true) == CB_ERR) + m_cbServer.AddString(jid); } } -- cgit v1.2.3