Changed functions for libotr4 compatibility

1 files changed, 26 insertions, 11 deletions

diff --git a/src/otr4.c b/src/otr4.c
index 69360d0f..158ffcc6 100644
--- a/src/otr4.c
+++ b/src/otr4.c
@@ -84,7 +84,7 @@ cb_otr_error_message(void *opdata, ConnContext *context,
 static void
 cb_otr_error_message_free(void *opdata, const char *err_msg)
 {
-    free(err_msg);
+    free((char *)err_msg);
 }
 
 static void
@@ -137,7 +137,6 @@ otr_init(void)
     ops.otr_error_message = cb_otr_error_message;
     ops.otr_error_message_free = cb_otr_error_message_free;
     ops.handle_msg_event = cb_handle_msg_event;
-    ops.display_otr_message = cb_display_otr_message;
     ops.write_fingerprints = cb_write_fingerprints;
     ops.gone_secure = cb_gone_secure;
 
@@ -318,7 +317,7 @@ gboolean
 otr_is_secure(const char * const recipient)
 {
     ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp",
-        0, NULL, NULL, NULL);
+        0, 0, NULL, NULL, NULL);
 
     if (context == NULL) {
         return FALSE;
@@ -335,7 +334,7 @@ gboolean
 otr_is_trusted(const char * const recipient)
 {
     ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp",
-        0, NULL, NULL, NULL);
+        0, 0, NULL, NULL, NULL);
 
     if (context == NULL) {
         return FALSE;
@@ -357,7 +356,7 @@ void
 otr_trust(const char * const recipient)
 {
     ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp",
-        0, NULL, NULL, NULL);
+        0, 0, NULL, NULL, NULL);
 
     if (context == NULL) {
         return;
@@ -379,7 +378,7 @@ void
 otr_untrust(const char * const recipient)
 {
     ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp",
-        0, NULL, NULL, NULL);
+        0, 0, NULL, NULL, NULL);
 
     if (context == NULL) {
         return;
@@ -401,10 +400,10 @@ void
 otr_end_session(const char * const recipient)
 {
     ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp",
-        0, NULL, NULL, NULL);
+        0, 0, NULL, NULL, NULL);
 
     if (context != NULL) {
-        otrl_message_disconnect(user_state, &ops, NULL, jid, "xmpp", recipient);
+        otrl_message_disconnect(user_state, &ops, NULL, jid, "xmpp", recipient, 0);
     }
 }
 
@@ -422,7 +421,7 @@ char *
 otr_get_their_fingerprint(const char * const recipient)
 {
     ConnContext *context = otrl_context_find(user_state, recipient, jid, "xmpp",
-        0, NULL, NULL, NULL);
+        0, 0, NULL, NULL, NULL);
 
     if (context != NULL) {
         Fingerprint *fingerprint = context->active_fingerprint;
@@ -447,11 +446,15 @@ otr_encrypt_message(const char * const to, const char * const message)
         jid,
         "xmpp",
         to,
+        0,
         message,
         0,
         &newmessage,
+        OTRL_FRAGMENT_SEND_ALL,
+        NULL,
         NULL,
         NULL);
+
     if (!err == GPG_ERR_NO_ERROR) {
         return NULL;
     } else {
@@ -465,14 +468,26 @@ otr_decrypt_message(const char * const from, const char * const message, gboolea
     char *decrypted = NULL;
     OtrlTLV *tlvs = NULL;
     OtrlTLV *tlv = NULL;
-    int result = otrl_message_receiving(user_state, &ops, NULL, jid, "xmpp", from, message, &decrypted, &tlvs, NULL, NULL);
+    int result = otrl_message_receiving(
+        user_state,
+        &ops,
+        NULL,
+        jid,
+        "xmpp",
+        from,
+        message,
+        &decrypted,
+        &tlvs,
+        NULL,
+        NULL,
+        NULL);
 
     // internal libotr message
     if (result == 1) {
         tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED);
         if (tlv) {
             ConnContext *context = otrl_context_find(user_state, from, jid, "xmpp",
-                0, NULL, NULL, NULL);
+                0, 0, NULL, NULL, NULL);
 
             if (context != NULL) {
                 otrl_context_force_plaintext(context);