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/AimOscar | |
| 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/AimOscar')
| -rw-r--r-- | protocols/AimOscar/client.cpp | 6 | ||||
| -rw-r--r-- | protocols/AimOscar/server.cpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/protocols/AimOscar/client.cpp b/protocols/AimOscar/client.cpp index dc2155727e..5c4421ac11 100644 --- a/protocols/AimOscar/client.cpp +++ b/protocols/AimOscar/client.cpp @@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "aim.h"
#include "version.h"
-#include <m_version.h>
int CAimProto::aim_send_connection_packet(HANDLE hServerConn,unsigned short &seqno,char *buf)
{
@@ -53,8 +52,9 @@ int CAimProto::aim_auth_request(HANDLE hServerConn,unsigned short &seqno,const c mir_md5_append(&state,(mir_md5_byte_t*)AIM_MD5_STRING, sizeof(AIM_MD5_STRING)-1);
mir_md5_finish(&state,auth_hash);
- char client_id[64];
- int client_id_len = mir_snprintf(client_id, sizeof(client_id), "Miranda AIM, version %s", MIRANDA_VERSION_STRING);
+ char client_id[64], mirver[64];
+ CallService(MS_SYSTEM_GETVERSIONTEXT, sizeof(mirver), (LPARAM)mirver);
+ int client_id_len = mir_snprintf(client_id, sizeof(client_id), "Miranda AIM, version %s", mirver);
char* buf=(char*)alloca(SNAC_SIZE+TLV_HEADER_SIZE*14+MD5_HASH_LENGTH+strlen(username)+client_id_len+30+strlen(language)+strlen(country));
diff --git a/protocols/AimOscar/server.cpp b/protocols/AimOscar/server.cpp index 0ab681b97b..a968c20bd5 100644 --- a/protocols/AimOscar/server.cpp +++ b/protocols/AimOscar/server.cpp @@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "aim.h"
#include "version.h"
-#include <m_version.h>
void CAimProto::snac_md5_authkey(SNAC &snac,HANDLE hServerConn,unsigned short &seqno, const char* username, const char* password)//family 0x0017
{
@@ -1069,7 +1068,7 @@ void CAimProto::snac_contact_list(SNAC &snac,HANDLE hServerConn,unsigned short & if (getDword(AIM_KEY_LV, 0) < 0x80500)
{
upload_nicks();
- setDword(AIM_KEY_LV, MIRANDA_VERSION_DWORD);
+ setDword(AIM_KEY_LV, (DWORD)CallService(MS_SYSTEM_GETVERSION,0,0));
}
if (getByte(AIM_KEY_CM, 0))
|