Changeset 3314ced for protocols/jabber

Timestamp:

2015-10-21T11:40:58Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

12f041d

Parents:

09f7ec1

Message:

jabber: set BEE_USER_NOOTR flag to _xmlconsole

Fixes trac ticket 1111, ​https://bugs.bitlbee.org/bitlbee/ticket/1111

One of the most annoying issues. You're trying to debug stuff and it
just crashes even harder than without the debug enabled.

File:

• protocols/jabber/jabber.c (modified) (3 diffs)

protocols/jabber/jabber.c

@@ -200 +200 @@
 }
 
+static void jabber_xmlconsole_enable(struct im_connection *ic)
+{
+        struct jabber_data *jd = ic->proto_data;
+        const char *handle = JABBER_XMLCONSOLE_HANDLE;
+        bee_user_t *bu;
+        
+        jd->flags |= JFLAG_XMLCONSOLE;
+
+        if (!(bu = bee_user_by_handle(ic->bee, ic, handle))) {
+                bu = bee_user_new(ic->bee, ic, handle, 0);
+                bu->flags |= BEE_USER_NOOTR;
+        }
+}
+
 /* Separate this from jabber_login() so we can do OAuth first if necessary.
    Putting this in io.c would probably be more correct. */
@@ -266 +280 @@
 
         if (set_getbool(&acc->set, "xmlconsole")) {
-                jd->flags |= JFLAG_XMLCONSOLE;
-                /* Shouldn't really do this at this stage already, maybe. But
-                   I think this shouldn't break anything. */
-                imcb_add_buddy(ic, JABBER_XMLCONSOLE_HANDLE, NULL);
+                jabber_xmlconsole_enable(ic);
         }
 
@@ -474 +485 @@
 static void jabber_add_buddy(struct im_connection *ic, char *who, char *group)
 {
-        struct jabber_data *jd = ic->proto_data;
-
         if (g_strcasecmp(who, JABBER_XMLCONSOLE_HANDLE) == 0) {
-                jd->flags |= JFLAG_XMLCONSOLE;
-                imcb_add_buddy(ic, JABBER_XMLCONSOLE_HANDLE, NULL);
+                jabber_xmlconsole_enable(ic);
                 return;
         }