From 8f6b8588dd7e883f246d430f8b03386a2e1d0681 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 11 Aug 2013 11:40:10 +0000 Subject: minor fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@5649 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AdvaImg/src/main.cpp | 2 ++ protocols/JabberG/src/jabber_misc.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/AdvaImg/src/main.cpp b/plugins/AdvaImg/src/main.cpp index 4fcd79905f..542c3c0dee 100644 --- a/plugins/AdvaImg/src/main.cpp +++ b/plugins/AdvaImg/src/main.cpp @@ -1193,6 +1193,8 @@ static int IMGSERVICE_Load() { FI_Populate(); + CreateServiceFunction(MS_DIB2PNG, serviceDib2Png); + CreateServiceFunction(MS_PNG2DIB, servicePng2Dib); CreateServiceFunction(MS_IMG_GETINTERFACE, serviceGetInterface); CreateServiceFunction(MS_IMG_LOAD, serviceLoad); CreateServiceFunction(MS_IMG_LOADFROMMEM, serviceLoadFromMem); diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp index 9f636480a2..f66613402b 100644 --- a/protocols/JabberG/src/jabber_misc.cpp +++ b/protocols/JabberG/src/jabber_misc.cpp @@ -287,7 +287,7 @@ void CJabberProto::GetAvatarFileName(HANDLE hContact, TCHAR* pszDest, size_t cbL else { ptrA res1( getStringA("LoginName")), res2( getStringA("LoginServer")); mir_sntprintf(pszDest + tPathLen, MAX_PATH - tPathLen, _T("%S@%S avatar%s"), - res1 ? res1 : "noname", res2 ? res2 : m_szModuleName, szFileType); + (res1) ? (LPSTR)res1 : "noname", (res2) ? (LPSTR)res2 : m_szModuleName, szFileType); } } -- cgit v1.2.3