diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-08-03 13:02:30 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-08-03 13:02:30 +0000 |
| commit | 3c5f60a5dc438523934fa598bfeb537056ad2470 (patch) | |
| tree | 357df4f85dfd31cb3e4433f42c705dddc01bf3fb /protocols/IcqOscarJ | |
| parent | d06e75fd7b0b11aa92fa075fdf30cec05d7a01f3 (diff) | |
m_version.h => MS_SYSTEM_GETVERSION[TEXT]
git-svn-id: http://svn.miranda-ng.org/main/trunk@1337 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IcqOscarJ')
| -rw-r--r-- | protocols/IcqOscarJ/UI/userinfotab.cpp | 2 | ||||
| -rwxr-xr-x | protocols/IcqOscarJ/fam_01service.cpp | 13 | ||||
| -rwxr-xr-x | protocols/IcqOscarJ/icqoscar.h | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/protocols/IcqOscarJ/UI/userinfotab.cpp b/protocols/IcqOscarJ/UI/userinfotab.cpp index 033fdd4a9a..91d28c0e04 100644 --- a/protocols/IcqOscarJ/UI/userinfotab.cpp +++ b/protocols/IcqOscarJ/UI/userinfotab.cpp @@ -258,7 +258,7 @@ static INT_PTR CALLBACK IcqDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM SetValue(ppro, hwndDlg, IDC_PORT, hContact, (char*)DBVT_WORD, (char*)ppro->wListenPort, SVS_ZEROISUNSPEC);
SetValue(ppro, hwndDlg, IDC_VERSION, hContact, (char*)DBVT_WORD, (char*)ICQ_VERSION, SVS_ICQVERSION);
- SetValue(ppro, hwndDlg, IDC_MIRVER, hContact, (char*)DBVT_ASCIIZ, MirandaVersionToString(str, TRUE, ICQ_PLUG_VERSION, MIRANDA_VERSION_DWORD), SVS_ZEROISUNSPEC);
+ SetValue(ppro, hwndDlg, IDC_MIRVER, hContact, (char*)DBVT_ASCIIZ, MirandaVersionToString(str, TRUE, ICQ_PLUG_VERSION, CallService(MS_SYSTEM_GETVERSION,0,0)), SVS_ZEROISUNSPEC);
SetDlgItemTextUtf(hwndDlg, IDC_SUPTIME, ICQTranslateUtfStatic(LPGEN("Member since:"), str, MAX_PATH));
SetValue(ppro, hwndDlg, IDC_SYSTEMUPTIME, hContact, szProto, "MemberTS", SVS_TIMESTAMP);
SetValue(ppro, hwndDlg, IDC_STATUS, hContact, (char*)DBVT_WORD, (char*)ppro->m_iStatus, SVS_STATUSID);
diff --git a/protocols/IcqOscarJ/fam_01service.cpp b/protocols/IcqOscarJ/fam_01service.cpp index 58860481ca..3b98079716 100755 --- a/protocols/IcqOscarJ/fam_01service.cpp +++ b/protocols/IcqOscarJ/fam_01service.cpp @@ -761,11 +761,14 @@ void CIcqProto::setUserInfo() packDWord(&packet, 0x4D697261); // Miranda Signature
packDWord(&packet, 0x6E64614E);
- WORD ver[4] = { MIRANDA_VERSION_FILEVERSION };
- packWord(&packet, ver[0]);
- packWord(&packet, ver[1]);
- packWord(&packet, ver[2]);
- packWord(&packet, ver[3]);
+ int v[4];
+ char mirver[100];
+ CallService(MS_SYSTEM_GETVERSIONTEXT, SIZEOF(mirver), LPARAM(mirver));
+ sscanf(mirver, "%d.%d.%d.%d", &v[0], &v[1], &v[2], &v[3]);
+ packWord(&packet, v[0]);
+ packWord(&packet, v[1]);
+ packWord(&packet, v[2]);
+ packWord(&packet, v[3]);
//MIM/PackName
if ( bHasPackName ) {
diff --git a/protocols/IcqOscarJ/icqoscar.h b/protocols/IcqOscarJ/icqoscar.h index 7000ac6b04..ef0e32a6fd 100755 --- a/protocols/IcqOscarJ/icqoscar.h +++ b/protocols/IcqOscarJ/icqoscar.h @@ -89,7 +89,6 @@ #include <m_cluiframes.h>
#include <m_ignore.h>
#include <m_avatars.h>
-#include <m_version.h>
#include <win2k.h>
// Project resources
|