summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-06-05 20:18:07 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-06-05 20:18:07 +0000
commit04706c9533f06ac10ab92b9fc608f8e669b66931 (patch)
tree9d88c3c77af91178d9f0cbb74fcf395fe16f14ea
parente410d433ad3d6c74d60f0c0797811cf409b68a41 (diff)
git-svn-id: http://svn.miranda-ng.org/main/trunk@323 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/Popup/src/config.cpp4
-rw-r--r--protocols/AimOscar/aim.cpp6
2 files changed, 6 insertions, 4 deletions
diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp
index 0f4dbb1309..169f6a7630 100644
--- a/plugins/Popup/src/config.cpp
+++ b/plugins/Popup/src/config.cpp
@@ -70,7 +70,7 @@ PLUGININFOEX pluginInfoEx =
POPUP_EMAIL,
POPUP_COPYRIGHT,
POPUP_WEBPAGE,
- 0,
+ UNICODE_AWARE,
0,
POPUP_UUID
};
@@ -150,7 +150,7 @@ void PopUpPreview()
#if defined(_DEBUG)
// test per-contact popups
- for (HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact;
+ for (HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact;
hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0))
{
if (DBGetContactSettingDword(hContact, "ICQ", "UIN", 0) == 256771455)
diff --git a/protocols/AimOscar/aim.cpp b/protocols/AimOscar/aim.cpp
index 7eb6609245..42b1b83e96 100644
--- a/protocols/AimOscar/aim.cpp
+++ b/protocols/AimOscar/aim.cpp
@@ -44,7 +44,7 @@ OBJLIST<CAimProto> g_Instances(1, sttCompareProtocols);
/////////////////////////////////////////////////////////////////////////////////////////
// Dll entry point
-extern "C"
+extern "C"
BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD /*fdwReason*/,LPVOID /*lpvReserved*/)
{
hInstance = hinstDLL;
@@ -54,7 +54,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD /*fdwReason*/,LPVOID /*lpvReserved*
/////////////////////////////////////////////////////////////////////////////////////////
// Plugin information
-static const PLUGININFOEX pluginInfo =
+static const PLUGININFOEX pluginInfo =
{
sizeof(PLUGININFOEX),
"AIM Protocol",
@@ -75,6 +75,8 @@ static const PLUGININFOEX pluginInfo =
extern "C" __declspec(dllexport) const PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
{
+ *(unsigned long*)(&AIM_CAP_MIRANDA[8]) = _htonl(mirandaVersion);
+ *(unsigned long*)(&AIM_CAP_MIRANDA[12]) = _htonl(__VERSION_DWORD);
return &pluginInfo;
}