summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--otr/dllmain.cpp4
-rw-r--r--otr/otr.mdsp12
-rw-r--r--otr/otr_private.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/otr/dllmain.cpp b/otr/dllmain.cpp
index 26a348e..24f41ea 100644
--- a/otr/dllmain.cpp
+++ b/otr/dllmain.cpp
@@ -1013,7 +1013,7 @@ int OnDatabaseEventPreAdd(WPARAM wParam, LPARAM lParam) {
return 0;
}
- if(strcmp(proto, "MetaContacts") == 0) {
+ if(ServiceExists(MS_MC_GETPROTOCOLNAME) && strcmp(proto, (char *)CallService(MS_MC_GETPROTOCOLNAME, 0, 0)) == 0) {
HANDLE hSubContact = (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)hContact, 0);
if(!hSubContact)
return 0;
@@ -1055,7 +1055,7 @@ int OnDatabaseEventPreAdd(WPARAM wParam, LPARAM lParam) {
// yes
msgw = (wchar_t *)&msg[msglen];
} else {
- // no, convert to unciode (allocate stack memory);
+ // no, convert to unciode (allocate stack memory)
if(dbei->flags && DBEF_UTF) {
int size = MultiByteToWideChar(CP_UTF8, 0, (char *) msg, -1, 0, 0);
msgw = (wchar_t *) _alloca(sizeof(wchar_t) * size);
diff --git a/otr/otr.mdsp b/otr/otr.mdsp
index ce6662e..c112bf0 100644
--- a/otr/otr.mdsp
+++ b/otr/otr.mdsp
@@ -124,11 +124,11 @@ extraResourceOptions=
25=..\..\..\..\..\..\..\msys\home\sje\libotr\src\userstate.h
26=..\..\..\..\..\..\..\msys\home\sje\libotr\src\version.h
[History]
-..\..\..\..\..\..\..\msys\home\sje\libotr\src\context.h,1839
+dllmain.cpp,35185
+..\..\..\..\..\..\..\msys\home\sje\libotr\src\message.h,9228
+..\..\..\..\..\..\..\msys\home\sje\libotr\src\proto.h,0
+common.h,844
+..\..\..\..\..\..\..\msys\home\sje\libotr\src\proto.c,1504
..\..\..\..\..\..\..\msys\home\sje\libotr\src\version.h,0
+..\..\..\..\..\..\..\msys\home\sje\libotr\src\context.h,1839
otr_private.h,171
-..\..\..\..\..\..\..\msys\home\sje\libotr\src\proto.c,1518
-common.h,844
-..\..\..\..\..\..\..\msys\home\sje\libotr\src\proto.h,2
-..\..\..\..\..\..\..\msys\home\sje\libotr\src\message.h,9228
-dllmain.cpp,25215
diff --git a/otr/otr_private.h b/otr/otr_private.h
index a25bc82..804a57c 100644
--- a/otr/otr_private.h
+++ b/otr/otr_private.h
@@ -5,7 +5,7 @@
#define VER_MAJOR 0
#define VER_MINOR 6
#define VER_RELEASE 0
-#define VER_BUILD 0
+#define VER_BUILD 1
#define __STRINGIZE(x) #x
#define VER_STRING __STRINGIZE( VER_MAJOR.VER_MINOR.VER_RELEASE.VER_BUILD )