diff options
| author | Sergey Bolhovskoy <elzorfox@ya.ru> | 2014-12-18 04:17:30 +0000 |
|---|---|---|
| committer | Sergey Bolhovskoy <elzorfox@ya.ru> | 2014-12-18 04:17:30 +0000 |
| commit | 0220c65f60daedd91dc8db724e73094d3d88db99 (patch) | |
| tree | e004c80eaa10a783cf4f675949f8132f25ebae0d /protocols/VKontakte/src/vk_thread.cpp | |
| parent | 871542c371272de467765e829d8400dc56b19db0 (diff) | |
VKontakte:
vk feeds support (notifications) – part 3
version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@11498 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/VKontakte/src/vk_thread.cpp')
| -rw-r--r-- | protocols/VKontakte/src/vk_thread.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp index 23226755ab..15bf752f69 100644 --- a/protocols/VKontakte/src/vk_thread.cpp +++ b/protocols/VKontakte/src/vk_thread.cpp @@ -55,6 +55,7 @@ static VOID CALLBACK TimerProc(HWND, UINT, UINT_PTR, DWORD) vk_Instances[i]->SetServerStatus(vk_Instances[i]->m_iDesiredStatus);
vk_Instances[i]->RetrieveUsersInfo(true);
vk_Instances[i]->RetrieveUnreadNews();
+ vk_Instances[i]->RetrieveUnreadNotifications();
}
}
@@ -1278,7 +1279,7 @@ CMString CVkProto::GetAttachmentDescr(JSONNODE *pAttachments) int iWidth = json_as_int(json_get(pPhoto, "width"));
int iHeight = json_as_int(json_get(pPhoto, "height"));
- res.AppendFormat(_T("%s: %s (%dx%d)"), TranslateT("Photo"), ptszLink, iWidth, iHeight);
+ res.AppendFormat(_T("%s: %s (%dx%d)"), TranslateT("Photo"), ptszLink ? ptszLink : _T(""), iWidth, iHeight);
if (m_bAddImgBbc)
res.AppendFormat(_T("\n\t[img]%s[/img]"), ptszLink);
}
@@ -1365,8 +1366,7 @@ CMString CVkProto::GetAttachmentDescr(JSONNODE *pAttachments) res.AppendFormat(_T("\n\t%s: %s"), TranslateT("Image"), tszImage.GetBuffer());
if (ptszDescription)
- res.AppendFormat(_T("\n\t%s"), ptszDescription ? ptszDescription: _T(""));
-
+ res.AppendFormat(_T("\n\t%s"), ptszDescription);
}
else res.AppendFormat(TranslateT("Unsupported or unknown attachment type: %s"), ptszType);
|