# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1189337080 -7200
# Node ID a7d21918234c4f04ffe0034c3b9aa67cae4386a5
# Parent  9bc68473f8a3776b283a36165da0fc358f564519
Fix jb_send_msg() call in OTR
Also add a cast to remove a compiler warning in jabglue.c

diff -r 9bc68473f8a3 -r a7d21918234c mcabber/src/jabglue.c
--- a/mcabber/src/jabglue.c	Sat Sep 08 13:21:07 2007 +0200
+++ b/mcabber/src/jabglue.c	Sun Sep 09 13:24:40 2007 +0200
@@ -653,7 +653,7 @@
   g_free(barejid);
 #endif // HAVE_GPGME || defined JEP0022 || defined JEP0085
 
-  x = jutil_msgnew(strtype, (char*)fjid, NULL,
+  x = jutil_msgnew((char*)strtype, (char*)fjid, NULL,
                    (enc ? "This message is PGP-encrypted." : (char*)text));
   if (subject) {
     xmlnode y;
diff -r 9bc68473f8a3 -r a7d21918234c mcabber/src/otr.c
--- a/mcabber/src/otr.c	Sat Sep 08 13:21:07 2007 +0200
+++ b/mcabber/src/otr.c	Sun Sep 09 13:24:40 2007 +0200
@@ -566,7 +566,7 @@
                               const char *message)
 {
   char * id = g_strdup("otrinject");
-  jb_send_msg(recipient, message, ROSTER_TYPE_USER, "", id, NULL);
+  jb_send_msg(recipient, message, ROSTER_TYPE_USER, "", id, NULL, NULL);
   g_free(id);
 }