MirOTR: compatibility update to support/use libotr 4

+ added otrlextensions from Psi+ (thanks guys, better than our old modification to libotr)
* basic instance tag support, though we don't offer user choice yet.
+ added ProtoGetNickname(), stolen from TabSRMM to get our own nickname of given protocol (utils.cpp)

git-svn-id: http://svn.miranda-ng.org/main/trunk@12503 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 50 insertions, 51 deletions

diff --git a/plugins/MirOTR/src/otr.h b/plugins/MirOTR/src/otr.h
index 795991ffdb..9691cbbfc7 100644
--- a/plugins/MirOTR/src/otr.h
+++ b/plugins/MirOTR/src/otr.h
@@ -1,51 +1,50 @@
-#pragma once

-

-extern OtrlUserState otr_user_state;

-extern OtrlMessageAppOps ops;

-

-extern "C" {

-

-	/* Return the OTR policy for the given context. */

-	OtrlPolicy otr_gui_policy(void *opdata, ConnContext *context);

-

-	/* Create a private key for the given accountname/protocol if

-	* desired. */

-	void otr_gui_create_privkey(void *opdata, const char *account_name, const char *protocol);

-

-	int otr_gui_is_logged_in(void *opdata, const char *accountname, const char *protocol, const char *recipient);

-

-	void otr_gui_inject_message(void *opdata, const char *accountname, const char *protocol, const char *recipient, const char *message);

-

-	void otr_gui_notify(void *opdata, OtrlNotifyLevel level, const char *accountname, const char *protocol, const char *username, const char *title, const char *primary, const char *secondary);

-

-	int otr_gui_display_otr_message(void *opdata, const char *accountname, const char *protocol, const char *username, const char *msg);

-

-	void otr_gui_update_context_list(void *opdata);

-

-	const char *otr_gui_protocol_name(void *opdata, const char *protocol);

-

-	void otr_gui_protocol_name_free(void *opdata, const char *protocol_name);

-

-	void otr_gui_new_fingerprint(void *opdata, OtrlUserState us, const char *accountname, const char *protocol, const char *username, unsigned char fingerprint[20]);

-

-	void otr_gui_write_fingerprints(void *opdata);

-

-	void otr_gui_gone_secure(void *opdata, ConnContext *context);

-

-	void otr_gui_gone_insecure(void *opdata, ConnContext *context);

-

-	void otr_gui_still_secure(void *opdata, ConnContext *context, int is_reply);

-

-	void otr_gui_log_message(void *opdata, const char *message);

-

-	int max_message_size(void *opdata, ConnContext *context);

-

-	const char *account_name(void *opdata, const char *account, const char *protocol);

-

-	void account_name_free(void *opdata, const char *account_name);

-

-	void add_appdata(void *data, ConnContext *context);

-

-}

-

-gcry_error_t otrl_privkey_write(OtrlUserState us, const char *filename);
\ No newline at end of file
+#pragma once
+
+extern OtrlUserState otr_user_state;
+extern OtrlMessageAppOps ops;
+
+/// @todo : add OTR version 3 instance tag choice (currently we use the most secure/active one)
+#define MIROTR_PROTO_HELLO "?OTRv23?"
+
+extern "C" {
+
+	/* Return the OTR policy for the given context. */
+	OtrlPolicy otr_gui_policy(void *opdata, ConnContext *context);
+
+	/* Create a private key for the given accountname/protocol if
+	* desired. */
+	void otr_gui_create_privkey(void *opdata, const char *account_name, const char *protocol);
+
+	int otr_gui_is_logged_in(void *opdata, const char *accountname, const char *protocol, const char *recipient);
+
+	void otr_gui_inject_message(void *opdata, const char *accountname, const char *protocol, const char *recipient, const char *message);
+
+	void otr_gui_update_context_list(void *opdata);
+
+	void otr_gui_new_fingerprint(void *opdata, OtrlUserState us, const char *accountname, const char *protocol, const char *username, unsigned char fingerprint[20]);
+
+	void otr_gui_write_fingerprints(void *opdata);
+
+	void otr_gui_gone_secure(void *opdata, ConnContext *context);
+
+	void otr_gui_gone_insecure(void *opdata, ConnContext *context);
+
+	void otr_gui_still_secure(void *opdata, ConnContext *context, int is_reply);
+
+	int max_message_size(void *opdata, ConnContext *context);
+
+	const char *account_name(void *opdata, const char *account, const char *protocol);
+
+	void account_name_free(void *opdata, const char *account_name);
+
+	void add_appdata(void *data, ConnContext *context);
+
+	const char* resent_msg_prefix(void *opdata, ConnContext *context);
+	void resent_msg_prefix_free(void *opdata, const char *prefix);
+	
+	void handle_smp_event(void *opdata, OtrlSMPEvent smp_event, ConnContext *context, unsigned short progress_percent, char *question);
+	
+	void handle_msg_event(void *opdata, OtrlMessageEvent msg_event, ConnContext *context, const char *message, gcry_error_t err);
+	
+	void otr_create_instag(void *opdata, const char *accountname, const char *protocol);
+}