diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-12 15:36:26 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-12 15:36:26 +0000 |
| commit | fee4c843c119ea024c8c88fc451c2eb6c028abd9 (patch) | |
| tree | d9d0d902d9b9fb5c8651c9a4cfdc53d88d9af787 /protocols | |
| parent | 4ae9916b55bd3dc17479563f1b3bb5ac3755315d (diff) | |
CVkChatUser::m_tszImage removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@7616 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/VKontakte/src/vk_chats.cpp | 8 | ||||
| -rw-r--r-- | protocols/VKontakte/src/vk_proto.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp index 0d4ad2e267..6ffca96a32 100644 --- a/protocols/VKontakte/src/vk_chats.cpp +++ b/protocols/VKontakte/src/vk_chats.cpp @@ -158,11 +158,9 @@ void CVkProto::OnReceiveChatInfo(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pRe ptrT fName(json_as_string(json_get(pUser, "first_name")));
ptrT lName(json_as_string(json_get(pUser, "last_name")));
CMString tszNick = CMString(fName).Trim() + _T(" ") + CMString(lName).Trim();
- cu->m_tszTitle = mir_tstrdup(tszNick);
+ cu->m_tszNick = mir_tstrdup(tszNick);
cu->m_bUnknown = false;
- cu->m_tszImage = json_as_string(json_get(pUser, "photo"));
-
if (bNew) {
GCDEST gcd = { m_szModuleName, cc->m_tszId, GC_EVENT_JOIN };
GCEVENT gce = { sizeof(GCEVENT), &gcd };
@@ -251,7 +249,7 @@ void CVkProto::AppendChatMessage(CVkChatInfo *cc, int mid, int uid, int msgTime, CVkChatUser *cu = cc->m_users.find((CVkChatUser*)&uid);
if (cu == NULL) {
cc->m_users.insert(cu = new CVkChatUser(uid));
- cu->m_tszTitle = mir_tstrdup(TranslateT("Unknown"));
+ cu->m_tszNick = mir_tstrdup(TranslateT("Unknown"));
cu->m_bUnknown = true;
}
@@ -264,7 +262,7 @@ void CVkProto::AppendChatMessage(CVkChatInfo *cc, int mid, int uid, int msgTime, gce.ptszUID = tszId;
gce.time = msgTime;
gce.dwFlags = (bIsHistory) ? GCEF_NOTNOTIFY : GCEF_ADDTOLOG;
- gce.ptszNick = cu->m_tszTitle;
+ gce.ptszNick = cu->m_tszNick;
gce.ptszText = ptszBody;
CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gce);
}
diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h index f17e6419c9..8d46429b69 100644 --- a/protocols/VKontakte/src/vk_proto.h +++ b/protocols/VKontakte/src/vk_proto.h @@ -85,7 +85,7 @@ struct CVkChatUser : public MZeroedObject int m_uid;
bool m_bDel, m_bUnknown;
- ptrT m_tszTitle, m_tszImage;
+ ptrT m_tszNick;
};
struct CVkChatInfo : public MZeroedObject
|