changeset 1343:8a05feb23c5a

Only use OTR encryption on other users
author franky@veqlargh.fs
date Tue, 06 Nov 2007 17:12:04 +0100
parents 06441b6cc23a
children 44ff580ee388
files mcabber/src/jabglue.c mcabber/src/otr.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/src/jabglue.c	Sat Nov 03 16:52:25 2007 +0100
+++ b/mcabber/src/jabglue.c	Tue Nov 06 17:12:04 2007 +0100
@@ -606,7 +606,7 @@
 #ifdef HAVE_LIBOTR
   if (msgid && strcmp(msgid, "otrinject") == 0)
     msgid = NULL;
-  else {
+  else if (type == ROSTER_TYPE_USER) {
     otr_msg = otr_send((char **)&text, barejid);
     if (!text) {
       g_free(barejid);
--- a/mcabber/src/otr.c	Sat Nov 03 16:52:25 2007 +0100
+++ b/mcabber/src/otr.c	Tue Nov 06 17:12:04 2007 +0100
@@ -608,7 +608,8 @@
                               const char *message)
 {
   char * id = g_strdup("otrinject");
-  jb_send_msg(recipient, message, ROSTER_TYPE_USER, "", id, NULL, NULL);
+  if (roster_gettype(recipient) == ROSTER_TYPE_USER)
+    jb_send_msg(recipient, message, ROSTER_TYPE_USER, "", id, NULL, NULL);
   g_free(id);
 }