diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2010-11-16 08:51:54 +0200 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2010-11-16 08:51:54 +0200 |
| commit | 46f48e58a81256148f74e5d753c708dd1ff3d563 (patch) | |
| tree | 8acb91d4fa98981e6af252a0f5e85d6101799540 /init.cpp | |
| parent | f499a663032ad79a2e5ccfe6195b36f8645ca9f0 (diff) | |
| parent | 6cf18be1f2a73e501cf855de4db7dd57a52581d5 (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchange
Conflicts:
main.cpp
Diffstat (limited to 'init.cpp')
| -rw-r--r-- | init.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -160,6 +160,7 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) void InitCheck(); void FirstRun(); + bIsMiranda09 = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0) >= 0x00090001?true:false; FirstRun(); InitCheck(); InitIconLib(); @@ -185,7 +186,6 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) } - bIsMiranda09 = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0) >= 0x00090001?true:false; bMetaContacts = ServiceExists(MS_MC_GETMETACONTACT); if(bJabberAPI && bIsMiranda09) |