diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-08-10 13:28:49 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-08-10 13:28:49 +0000 |
| commit | 794fa3fb5cc63ac9b69908bd04f4be985a4a8cd1 (patch) | |
| tree | fdbdd95eff3b6508bd38aefb0695ccd96afdbbca /plugins/MenuItemEx | |
| parent | f2935b7bf093965926cee07254f7a015ecd492cd (diff) | |
- unused services MS_FP_SAMECLIENTS & MS_FP_GETCLIENTICON removed;
- Finger_IsSameClents & Finger_GetClientIcon helpers added;
- unused code removed from FingerPrint or replaced with the calls from mir_core.dll
git-svn-id: http://svn.miranda-ng.org/main/trunk@5632 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MenuItemEx')
| -rw-r--r-- | plugins/MenuItemEx/src/main.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index 37e33d37d2..c89089478d 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -378,14 +378,14 @@ void getIP(HANDLE hContact,LPSTR szProto,LPSTR szIP) strcat(szIP, szmIP);
}
-LPSTR getMirVer(HANDLE hContact)
+LPTSTR getMirVer(HANDLE hContact)
{
LPSTR szProto = GetContactProto(hContact);
if (!szProto) return NULL;
- LPSTR msg = db_get_sa(hContact,szProto,"MirVer");
+ LPTSTR msg = db_get_tsa(hContact,szProto,"MirVer");
if (msg) {
- if (strlen(msg))
+ if (msg[0] != 0)
return msg;
mir_free(msg);
}
@@ -601,10 +601,10 @@ void ModifyCopyMirVer(HANDLE hContact) CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIM_ICON;
- if (ServiceExists(MS_FP_GETCLIENTICON)) {
- LPSTR msg = getMirVer(hContact);
+ if ( ServiceExists(MS_FP_GETCLIENTICONT)) {
+ LPTSTR msg = getMirVer(hContact);
if (msg) {
- mi.hIcon = (HICON)CallService(MS_FP_GETCLIENTICON,(WPARAM)msg,(LPARAM)1);
+ mi.hIcon = Finger_GetClientIcon(msg, 1);
mir_free(msg);
}
}
@@ -703,11 +703,11 @@ INT_PTR onCopyIP(WPARAM wparam,LPARAM lparam) INT_PTR onCopyMirVer(WPARAM wparam,LPARAM lparam)
{
- LPSTR msg = getMirVer((HANDLE)wparam);
+ LPTSTR msg = getMirVer((HANDLE)wparam);
if (msg) {
- CopyToClipboard((HWND)lparam, msg, 0);
+ CopyToClipboard((HWND)lparam, _T2A(msg), 0);
if (CTRL_IS_PRESSED && bPopupService)
- ShowPopup(msg, 0, (HANDLE)wparam);
+ ShowPopup( _T2A(msg), 0, (HANDLE)wparam);
mir_free(msg);
}
|