diff options
| -rw-r--r-- | otr/dllmain.cpp | 16 | ||||
| -rw-r--r-- | otr/otr.mdsp | 10 | ||||
| -rw-r--r-- | otr/otr_private.h | 2 |
3 files changed, 18 insertions, 10 deletions
diff --git a/otr/dllmain.cpp b/otr/dllmain.cpp index 368060d..f4711b4 100644 --- a/otr/dllmain.cpp +++ b/otr/dllmain.cpp @@ -295,8 +295,7 @@ extern "C" void otr_gui_inject_message(void *opdata, const char *accountname, co ccs.hContact = hContact;
ccs.szProtoService = PSS_MESSAGE;
ccs.lParam = (LPARAM)Translate(message);
- CallContactService(
- CallService(protocol, PSS_MESSAGE, 0, (LPARAM)&ccs);
+ CallProtoService(protocol, PSS_MESSAGE, 0, (LPARAM)&ccs);
*/
CallContactService(hContact, PSS_MESSAGE, PREF_UTF, (LPARAM)Translate(message));
}
@@ -659,9 +658,14 @@ int OTRSendMessage(WPARAM wParam,LPARAM lParam){ //MessageBox(0, (char *)ccs->lParam, "OTR - sending raw message", MB_OK);
char *proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0);
- if(proto && metaproto && strcmp(proto, metaproto) == 0) // bypass for metacontacts
+ if(proto && metaproto && strcmp(proto, metaproto) == 0) {// bypass for metacontacts
+ //PUShowMessage("OTR bypassing metacontact", SM_NOTIFY);
return CallService(MS_PROTO_CHAINSEND, wParam, lParam);
- if(!proto) return 1; // error
+ }
+ if(!proto) {
+ //PUShowMessage("OTR error no proto", SM_NOTIFY);
+ return 1; // error
+ }
gcry_error_t err;
char *newmessage = 0;
@@ -700,6 +704,7 @@ int OTRSendMessage(WPARAM wParam,LPARAM lParam){ // don't filter OTR messages being sent (OTR messages should only happen *after* the otrl_message_sending call below)
if(strncmp(oldmessage_utf, "?OTR", 4) == 0) {
free(oldmessage_utf);
+ PUShowMessage("OTR skipping otr message", SM_NOTIFY);
return CallService(MS_PROTO_CHAINSEND, wParam, lParam);
}
@@ -813,7 +818,8 @@ int OTRSendMessageW(WPARAM wParam, LPARAM lParam){ if(!lParam) return 0;
CCSDATA *ccs = (CCSDATA *) lParam;
- ccs->wParam |= PREF_UNICODE;
+ if(!(ccs->wParam & PREF_UTF))
+ ccs->wParam |= PREF_UNICODE;
return OTRSendMessage(wParam, lParam);
}
diff --git a/otr/otr.mdsp b/otr/otr.mdsp index 873f005..fc27187 100644 --- a/otr/otr.mdsp +++ b/otr/otr.mdsp @@ -124,10 +124,10 @@ extraResourceOptions= 25=..\..\..\..\..\..\..\msys\home\sje\libotr\src\userstate.h
26=..\..\..\..\..\..\..\msys\home\sje\libotr\src\version.h
[History]
-.svn\text-base\dllmain.cpp.svn-base,34873
-options.cpp,9854
+otr_private.h,149
+.svn\text-base\dllmain.cpp.svn-base,34867
+options.cpp,17558
menu.cpp,995
-dllmain.cpp,9853
..\..\..\..\..\..\..\msys\home\sje\libotr\src\message.h,9228
..\..\..\..\..\..\..\msys\home\sje\libotr\src\proto.h,0
common.h,1593
@@ -135,4 +135,6 @@ common.h,1593 ..\..\..\..\..\..\..\msys\home\sje\libotr\src\version.h,0
..\..\..\..\..\..\..\msys\home\sje\libotr\src\context.h,1839
utils.cpp,0
-otr_private.h,171
+dll.h,0
+utils.h,0
+dllmain.cpp,23427
diff --git a/otr/otr_private.h b/otr/otr_private.h index b153bc1..6bae74b 100644 --- a/otr/otr_private.h +++ b/otr/otr_private.h @@ -5,7 +5,7 @@ #define VER_MAJOR 0
#define VER_MINOR 7
#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 )
|