Changeset 29ff5c2 for protocols

Timestamp:

2015-11-21T00:01:50Z (9 years ago)

Author:

dequis <dx@…>

Parents:

e4f08bf (diff), 8fdeaa5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feat/hip-cat

Location:

protocols

Files:

• bee.h (modified) (3 diffs)
• bee_chat.c (modified) (3 diffs)
• bee_user.c (modified) (3 diffs)
• ft.h (modified) (2 diffs)
• jabber/conference.c (modified) (9 diffs)
• jabber/io.c (modified) (1 diff)
• jabber/iq.c (modified) (1 diff)
• jabber/jabber.c (modified) (8 diffs)
• jabber/jabber_util.c (modified) (1 diff)
• jabber/message.c (modified) (2 diffs)
• jabber/s5bytestream.c (modified) (3 diffs)
• jabber/sasl.c (modified) (4 diffs)
• jabber/si.c (modified) (3 diffs)
• msn/ns.c (modified) (4 diffs)
• msn/soap.c (modified) (3 diffs)
• nogaim.c (modified) (1 diff)
• nogaim.h (modified) (2 diffs)
• oscar/aim.h (modified) (1 diff)
• oscar/auth.c (modified) (1 diff)
• oscar/conn.c (modified) (3 diffs)
• oscar/im.c (modified) (7 diffs)
• oscar/misc.c (modified) (1 diff)
• oscar/msgcookie.c (modified) (1 diff)
• oscar/oscar.c (modified) (5 diffs)
• oscar/rxhandlers.c (modified) (1 diff)
• oscar/rxqueue.c (modified) (2 diffs)
• oscar/service.c (modified) (3 diffs)
• oscar/tlv.c (modified) (2 diffs)
• oscar/txqueue.c (modified) (1 diff)
• purple/purple.c (modified) (3 diffs)
• skype/README (modified) (1 diff)
• skype/skype.c (modified) (7 diffs)
• skype/t/add-yes-bitlbee.mock (modified) (1 diff)
• skype/t/added-no-bitlbee.mock (modified) (1 diff)
• skype/t/added-yes-bitlbee.mock (modified) (1 diff)
• skype/t/away-set-bitlbee.mock (modified) (1 diff)
• skype/t/call-bitlbee.mock (modified) (1 diff)
• skype/t/call-failed-bitlbee.mock (modified) (1 diff)
• skype/t/called-no-bitlbee.mock (modified) (1 diff)
• skype/t/called-yes-bitlbee.mock (modified) (1 diff)
• skype/t/ctcp-help-bitlbee.mock (modified) (1 diff)
• skype/t/filetransfer-bitlbee.mock (modified) (1 diff)
• skype/t/group-add-bitlbee.mock (modified) (1 diff)
• skype/t/group-read-bitlbee.mock (modified) (1 diff)
• skype/t/groupchat-invite-bitlbee.mock (modified) (2 diffs)
• skype/t/groupchat-invite-skyped.mock (modified) (1 diff)
• skype/t/groupchat-invited-bitlbee.mock (modified) (2 diffs)
• skype/t/groupchat-leave-bitlbee.mock (modified) (2 diffs)
• skype/t/groupchat-leave-skyped.mock (modified) (1 diff)
• skype/t/groupchat-msg-bitlbee.mock (modified) (2 diffs)
• skype/t/groupchat-msg-skyped.mock (modified) (1 diff)
• skype/t/groupchat-topic-bitlbee.mock (modified) (2 diffs)
• skype/t/info-bitlbee.mock (modified) (1 diff)
• skype/t/login-bitlbee.mock (modified) (1 diff)
• skype/t/msg-bitlbee.mock (modified) (1 diff)
• skype/t/set-mood-text-bitlbee.mock (modified) (1 diff)
• twitter/twitter.c (modified) (2 diffs)
• twitter/twitter_http.c (modified) (4 diffs)
• twitter/twitter_lib.c (modified) (5 diffs)
• twitter/twitter_lib.h (modified) (1 diff)
• yahoo/libyahoo2.c (modified) (2 diffs)
• yahoo/yahoo.c (modified) (1 diff)
• yahoo/yahoo2_callbacks.h (modified) (1 diff)

protocols/bee.h

@@ -62 +62 @@
         BEE_USER_LOCAL = 256,   /* Locally-added contacts (not in real contact list) */
         BEE_USER_SPECIAL = 512, /* Denotes a user as being special */
+        BEE_USER_NOOTR = 4096,  /* Per-user version of OPT_NOOTR */
 } bee_user_flags_t;
 
@@ -104 +105 @@
         gboolean (*user_status)(bee_t *bee, struct bee_user *bu, struct bee_user *old);
         /* On every incoming message. sent_at = 0 means unknown. */
-        gboolean (*user_msg)(bee_t *bee, bee_user_t *bu, const char *msg, time_t sent_at);
+        gboolean (*user_msg)(bee_t *bee, bee_user_t *bu, const char *msg, guint32 flags, time_t sent_at);
         /* Flags currently defined (OPT_TYPING/THINKING) in nogaim.h. */
         gboolean (*user_typing)(bee_t *bee, bee_user_t *bu, guint32 flags);
@@ -119 +120 @@
         /* System messages of any kind. */
         gboolean (*chat_log)(bee_t *bee, struct groupchat *c, const char *text);
-        gboolean (*chat_msg)(bee_t *bee, struct groupchat *c, bee_user_t *bu, const char *msg, time_t sent_at);
+        gboolean (*chat_msg)(bee_t *bee, struct groupchat *c, bee_user_t *bu, const char *msg, guint32 flags, time_t sent_at);
         gboolean (*chat_add_user)(bee_t *bee, struct groupchat *c, bee_user_t *bu);
-        gboolean (*chat_remove_user)(bee_t *bee, struct groupchat *c, bee_user_t *bu);
+        gboolean (*chat_remove_user)(bee_t *bee, struct groupchat *c, bee_user_t *bu, const char *reason);
         gboolean (*chat_topic)(bee_t *bee, struct groupchat *c, const char *new_topic, bee_user_t *bu);
         gboolean (*chat_name_hint)(bee_t *bee, struct groupchat *c, const char *name);

protocols/bee_chat.c

@@ -104 +104 @@
 }
 
-void imcb_chat_msg(struct groupchat *c, const char *who, char *msg, uint32_t flags, time_t sent_at)
+void imcb_chat_msg(struct groupchat *c, const char *who, char *msg, guint32 flags, time_t sent_at)
 {
         struct im_connection *ic = c->ic;
         bee_t *bee = ic->bee;
         bee_user_t *bu;
-        gboolean temp;
+        gboolean temp = FALSE;
         char *s;
 
-        /* Gaim sends own messages through this too. IRC doesn't want this, so kill them */
-        if (handle_is_self(ic, who)) {
+        if (handle_is_self(ic, who) && !(flags & OPT_SELFMESSAGE)) {
                 return;
         }
@@ -131 +130 @@
 
         if (bee->ui->chat_msg) {
-                bee->ui->chat_msg(bee, c, bu, msg, sent_at);
+                bee->ui->chat_msg(bee, c, bu, msg, flags, sent_at);
         }
 
@@ -239 +238 @@
 
         if (bee->ui->chat_remove_user && bu) {
-                bee->ui->chat_remove_user(bee, c, bu);
+                bee->ui->chat_remove_user(bee, c, bu, reason);
         }
 }

protocols/bee_user.c

@@ -247 +247 @@
 }
 
-void imcb_buddy_msg(struct im_connection *ic, const char *handle, const char *msg, uint32_t flags, time_t sent_at)
+void imcb_buddy_msg(struct im_connection *ic, const char *handle, const char *msg, guint32 flags, time_t sent_at)
 {
         bee_t *bee = ic->bee;
@@ -265 +265 @@
 
         if (bee->ui->user_msg && bu) {
-                bee->ui->user_msg(bee, bu, msg, sent_at);
+                bee->ui->user_msg(bee, bu, msg, flags, sent_at);
         } else {
                 imcb_log(ic, "Message from unknown handle %s:\n%s", handle, msg);
@@ -297 +297 @@
 }
 
-void imcb_buddy_typing(struct im_connection *ic, const char *handle, uint32_t flags)
+void imcb_buddy_typing(struct im_connection *ic, const char *handle, guint32 flags)
 {
         bee_user_t *bu;

protocols/ft.h

@@ -58 +58 @@
  *                                    | accept
  *                                    V
- *                     /------ /-------------\                    /------------------------\
- *         out_of_data |       | TRANSFERING | -----------------> | TRANSFERING | CANCELED |
- *                     \-----> \-------------/  [canceled,]free   \------------------------/
+ *                     /------ /-------------\                    /--------------------------\
+ *         out_of_data |       | TRANSFERRING | -----------------> | TRANSFERRING | CANCELED |
+ *                     \-----> \-------------/  [canceled,]free   \--------------------------/
  *                                    |
  *                                    | finished,free
  *                                    V
- *                       /------------------------\
- *                       | TRANSFERING | FINISHED |
- *                       \------------------------/
+ *                       /-------------------------\
+ *                       | TRANSFERRING | FINISHED |
+ *                       \-------------------------/
  */
 typedef struct file_transfer {
@@ -115 +115 @@
 
         /*
-         * If set, called after succesful connection setup.
+         * If set, called after successful connection setup.
          */
         void (*accept)(struct file_transfer *file);

protocols/jabber/conference.c

@@ -26 +26 @@
 
 static xt_status jabber_chat_join_failed(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
+static xt_status jabber_chat_self_message(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 
 struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password)
@@ -127 +128 @@
 }
 
+static xt_status jabber_chat_self_message(struct im_connection *ic, struct xt_node *node, struct xt_node *orig)
+{
+        /* This is a self message sent by this bitlbee - just drop it */
+        return XT_ABORT;
+}
+
 struct groupchat *jabber_chat_by_jid(struct im_connection *ic, const char *name)
 {
@@ -171 +178 @@
         node = jabber_make_packet("message", "groupchat", jc->name, node);
 
-        if (!jabber_write_packet(ic, node)) {
-                xt_free_node(node);
-                return 0;
-        }
-        xt_free_node(node);
-
-        return 1;
+        jabber_cache_add(ic, node, jabber_chat_self_message);
+
+        return !jabber_write_packet(ic, node);
 }
 
@@ -299 +302 @@
                                         }
                                 }
-
-                                /* Some program-specific restrictions. */
-                                imcb_clean_handle(ic, bud->ext_jid);
                         }
                         bud->flags |= JBFLAG_IS_ANONYMOUS;
@@ -331 +331 @@
         } else if (type) { /* type can only be NULL or "unavailable" in this function */
                 if ((bud->flags & JBFLAG_IS_CHATROOM) && bud->ext_jid) {
+                        char *reason = NULL;
+                        char *status = NULL;
+                        char *status_text = NULL;
+                        
+                        if ((c = xt_find_node_by_attr(node->children, "x", "xmlns", XMLNS_MUC_USER))) {
+                                struct xt_node *c2 = c->children;
+
+                                while ((c2 = xt_find_node(c2, "status"))) {
+                                        char *code = xt_find_attr(c2, "code");
+                                        if (g_strcmp0(code, "301") == 0) {
+                                                status = "Banned";
+                                                break;
+                                        } else if (g_strcmp0(code, "303") == 0) {
+                                                /* This could be handled in a cleverer way,
+                                                 * but let's just show a literal part/join for now */
+                                                status = "Changing nicks";
+                                                break;
+                                        } else if (g_strcmp0(code, "307") == 0) {
+                                                status = "Kicked";
+                                                break;
+                                        }
+                                        c2 = c2->next;
+                                }
+
+                                /* Sometimes the status message is in presence/x/item/reason */
+                                if ((c2 = xt_find_path(c, "item/reason")) && c2->text && c2->text_len) {
+                                        status_text = c2->text;
+                                }
+                        }
+
+                        /* Sometimes the status message is right inside <presence> */
+                        if ((c = xt_find_node(node->children, "status")) && c->text && c->text_len) {
+                                status_text = c->text;
+                        }
+
+                        if (status_text && status) {
+                                reason = g_strdup_printf("%s: %s", status, status_text);
+                        } else {
+                                reason = g_strdup(status_text ? : status);
+                        }
+
                         s = strchr(bud->ext_jid, '/');
                         if (s) {
                                 *s = 0;
                         }
-                        imcb_chat_remove_buddy(chat, bud->ext_jid, NULL);
+                        imcb_chat_remove_buddy(chat, bud->ext_jid, reason);
                         if (bud != jc->me && bud->flags & JBFLAG_IS_ANONYMOUS) {
-                                imcb_remove_buddy(ic, bud->ext_jid, NULL);
+                                imcb_remove_buddy(ic, bud->ext_jid, reason);
                         }
                         if (s) {
                                 *s = '/';
                         }
+
+                        g_free(reason);
                 }
 
@@ -360 +403 @@
         char *final_from = NULL;
         char *bare_jid = NULL;
+        guint32 flags = 0;
 
         from = (bud) ? bud->full_jid : xt_find_attr(node, "from");
@@ -396 +440 @@
 
         if (subject && chat) {
-                char *subject_text = subject->text_len > 0 ? subject->text : NULL;
+                char *subject_text = subject->text_len > 0 ? subject->text : "";
                 if (g_strcmp0(chat->topic, subject_text) != 0) {
                         bare_jid = (bud) ? jabber_get_bare_jid(bud->ext_jid) : NULL;
@@ -402 +446 @@
                                         jabber_get_timestamp(node));
                         g_free(bare_jid);
+                        bare_jid = NULL;
                 }
         }
@@ -422 +467 @@
                 imcb_chat_log(chat, "From conference server: %s", body->text);
                 return;
-        } else if (jc && jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me) {
-                /* exclude self-messages since they would get filtered out
-                 * but not the ones in the backlog */
+        } else if (jc && jc->flags & JCFLAG_MESSAGE_SENT && bud == jc->me &&
+                   (jabber_cache_handle_packet(ic, node) == XT_ABORT)) {
+                /* Self message marked by this bitlbee, don't show it */
                 return;
         }
 
-        if (bud && jc && bud != jc->me) {
+        if (bud) {
                 bare_jid = jabber_get_bare_jid(bud->ext_jid ? bud->ext_jid : bud->full_jid);
                 final_from = bare_jid;
+                flags = (bud == jc->me) ? OPT_SELFMESSAGE : 0;
         } else {
                 final_from = nick;
         }
 
-        imcb_chat_msg(chat, final_from, body->text, 0, jabber_get_timestamp(node));
+        imcb_chat_msg(chat, final_from, body->text, flags, jabber_get_timestamp(node));
 
         g_free(bare_jid);

protocols/jabber/io.c

@@ -147 +147 @@
 }
 
-static gboolean jabber_read_callback(gpointer data, gint fd, b_input_condition cond)
-{
-        struct im_connection *ic = data;
-        struct jabber_data *jd = ic->proto_data;
-        char buf[512];
-        int st;
-
-        if (jd->fd == -1) {
-                return FALSE;
-        }
-
-        if (jd->ssl) {
-                st = ssl_read(jd->ssl, buf, sizeof(buf));
-        } else {
-                st = read(jd->fd, buf, sizeof(buf));
-        }
-
-        if (st > 0) {
-                /* Parse. */
-                if (xt_feed(jd->xt, buf, st) < 0) {
+static gboolean jabber_feed_input(struct im_connection *ic, char *buf, int size)
+{
+        struct jabber_data *jd = ic->proto_data;
+
+        /* Allow not passing a size for debugging purposes.
+         * This never happens when reading from the socket */
+        if (size == -1) {
+                size = strlen(buf);
+        }
+
+        /* Parse. */
+        if (xt_feed(jd->xt, buf, size) < 0) {
+                imcb_error(ic, "XML stream error");
+                imc_logout(ic, TRUE);
+                return FALSE;
+        }
+
+        /* Execute all handlers. */
+        if (!xt_handle(jd->xt, NULL, 1)) {
+                /* Don't do anything, the handlers should have
+                   aborted the connection already. */
+                return FALSE;
+        }
+
+        if (jd->flags & JFLAG_STREAM_RESTART) {
+                jd->flags &= ~JFLAG_STREAM_RESTART;
+                jabber_start_stream(ic);
+        }
+
+        /* Garbage collection. */
+        xt_cleanup(jd->xt, NULL, 1);
+
+        /* This is a bit hackish, unfortunately. Although xmltree
+           has nifty event handler stuff, it only calls handlers
+           when nodes are complete. Since the server should only
+           send an opening <stream:stream> tag, we have to check
+           this by hand. :-( */
+        if (!(jd->flags & JFLAG_STREAM_STARTED) && jd->xt && jd->xt->root) {
+                if (g_strcasecmp(jd->xt->root->name, "stream:stream") == 0) {
+                        jd->flags |= JFLAG_STREAM_STARTED;
+
+                        /* If there's no version attribute, assume
+                           this is an old server that can't do SASL
+                           authentication. */
+                        if (!set_getbool(&ic->acc->set, "sasl") || !sasl_supported(ic)) {
+                                /* If there's no version= tag, we suppose
+                                   this server does NOT implement: XMPP 1.0,
+                                   SASL and TLS. */
+                                if (set_getbool(&ic->acc->set, "tls")) {
+                                        imcb_error(ic, "TLS is turned on for this "
+                                                   "account, but is not supported by this server");
+                                        imc_logout(ic, FALSE);
+                                        return FALSE;
+                                } else {
+                                        if (!jabber_init_iq_auth(ic)) {
+                                                return FALSE;
+                                        }
+                                }
+                        }
+                } else {
                         imcb_error(ic, "XML stream error");
                         imc_logout(ic, TRUE);
                         return FALSE;
                 }
-
-                /* Execute all handlers. */
-                if (!xt_handle(jd->xt, NULL, 1)) {
-                        /* Don't do anything, the handlers should have
-                           aborted the connection already. */
+        }
+
+        return TRUE;
+}
+
+
+static gboolean jabber_read_callback(gpointer data, gint fd, b_input_condition cond)
+{
+        struct im_connection *ic = data;
+        struct jabber_data *jd = ic->proto_data;
+        char buf[512];
+        int st;
+
+        if (jd->fd == -1) {
+                return FALSE;
+        }
+
+        if (jd->ssl) {
+                st = ssl_read(jd->ssl, buf, sizeof(buf));
+        } else {
+                st = read(jd->fd, buf, sizeof(buf));
+        }
+
+        if (st > 0) {
+                if (!jabber_feed_input(ic, buf, st)) {
                         return FALSE;
-                }
-
-                if (jd->flags & JFLAG_STREAM_RESTART) {
-                        jd->flags &= ~JFLAG_STREAM_RESTART;
-                        jabber_start_stream(ic);
-                }
-
-                /* Garbage collection. */
-                xt_cleanup(jd->xt, NULL, 1);
-
-                /* This is a bit hackish, unfortunately. Although xmltree
-                   has nifty event handler stuff, it only calls handlers
-                   when nodes are complete. Since the server should only
-                   send an opening <stream:stream> tag, we have to check
-                   this by hand. :-( */
-                if (!(jd->flags & JFLAG_STREAM_STARTED) && jd->xt && jd->xt->root) {
-                        if (g_strcasecmp(jd->xt->root->name, "stream:stream") == 0) {
-                                jd->flags |= JFLAG_STREAM_STARTED;
-
-                                /* If there's no version attribute, assume
-                                   this is an old server that can't do SASL
-                                   authentication. */
-                                if (!set_getbool(&ic->acc->set, "sasl") || !sasl_supported(ic)) {
-                                        /* If there's no version= tag, we suppose
-                                           this server does NOT implement: XMPP 1.0,
-                                           SASL and TLS. */
-                                        if (set_getbool(&ic->acc->set, "tls")) {
-                                                imcb_error(ic, "TLS is turned on for this "
-                                                           "account, but is not supported by this server");
-                                                imc_logout(ic, FALSE);
-                                                return FALSE;
-                                        } else {
-                                                return jabber_init_iq_auth(ic);
-                                        }
-                                }
-                        } else {
-                                imcb_error(ic, "XML stream error");
-                                imc_logout(ic, TRUE);
-                                return FALSE;
-                        }
                 }
         } else if (st == 0 || (st < 0 && !ssl_sockerr_again(jd->ssl))) {

protocols/jabber/iq.c

@@ -385 +385 @@
         struct xt_node *response;
         struct jabber_data *jd = ic->proto_data;
-
-        response = jabber_make_packet("iq", "result", g_strdup_printf("%s@%s", jd->username, jd->server), NULL);
+        
+        response = jabber_make_packet("iq", "result", jd->me, NULL);
 
         jabber_cache_add(ic, response, NULL);

protocols/jabber/jabber.c

@@ -85 +85 @@
                 set_setstr(&acc->set, "server", "chat.hipchat.com");
         } else {
-                s = set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
+                set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
+
+                /* this reuses set_eval_oauth, which clears the password */
+                set_add(&acc->set, "anonymous", "false", set_eval_oauth, acc);
         }
 
@@ -194 +197 @@
         } else {
                 jabber_connect(ic);
+        }
+}
+
+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;
         }
 }
@@ -263 +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);
         }
 
@@ -331 +345 @@
         }
         if (jd->fd >= 0) {
-                closesocket(jd->fd);
+                proxy_disconnect(jd->fd);
         }
 
@@ -342 +356 @@
         }
 
-        jabber_buddy_remove_all(ic);
+        if (jd->buddies) {
+                jabber_buddy_remove_all(ic);
+        }
 
         xt_free(jd->xt);
@@ -469 +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;
         }
@@ -587 +600 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        struct jabber_buddy *bud;
+        struct jabber_buddy *bud, *bare;
 
         /* Enable typing notification related code from now. */
         jd->flags |= JFLAG_WANT_TYPING;
 
-        if ((bud = jabber_buddy_by_jid(ic, who, 0)) == NULL) {
+        if ((bud = jabber_buddy_by_jid(ic, who, 0)) == NULL ||
+            (bare = jabber_buddy_by_jid(ic, who, GET_BUDDY_BARE)) == NULL) {
                 /* Sending typing notifications to unknown buddies is
                    unsupported for now. Shouldn't be a problem, I think. */
@@ -598 +612 @@
         }
 
-        if (bud->flags & JBFLAG_DOES_XEP85) {
+
+        if (bud->flags & JBFLAG_DOES_XEP85 || bare->flags & JBFLAG_DOES_XEP85) {
                 /* We're only allowed to send this stuff if we know the other
-                   side supports it. */
+                   side supports it. If the bare JID has the flag, all other
+                   resources get it, too (That is the case in gtalk) */
 
                 struct xt_node *node;

protocols/jabber/jabber_util.c

@@ -514 +514 @@
                 } else if (bud->resource && (flags & GET_BUDDY_EXACT)) {
                         /* We want an exact match, so in thise case there shouldn't be a /resource. */
-                        return NULL;
+                        if (head != bud && head->resource == NULL) {
+                                return head;
+                        } else {
+                                return NULL;
+                        }
                 } else if (bud->resource == NULL || bud->next == NULL) {
                         /* No need for selection if there's only one option. */

protocols/jabber/message.c

@@ -37 +37 @@
         if (!from) {
                 return XT_HANDLED; /* Consider this packet corrupted. */
+        }
 
-        }
-        if (request && id) {
+        if (request && id && g_strcmp0(type, "groupchat") != 0) {
                 /* Send a message receipt (XEP-0184), looking like this:
-                 * <message
-                 *  from='kingrichard@royalty.england.lit/throne'
-                 *  id='bi29sg183b4v'
-                 *  to='northumberland@shakespeare.lit/westminster'>
+                 * <message from='...' id='...' to='...'>
                  *  <received xmlns='urn:xmpp:receipts' id='richard2-4.1.247'/>
-                 * </message> */
+                 * </message>
+                 *
+                 * MUC messages are excluded, since receipts aren't supposed to be sent over MUCs
+                 * (XEP-0184 section 5.3) and replying to those may result in 'forbidden' errors.
+                 */
                 struct xt_node *received, *receipt;
 
@@ -142 +143 @@
                         imcb_buddy_typing(ic, from, OPT_TYPING);
                 }
-                /* No need to send a "stopped typing" signal when there's a message. */
-                else if (xt_find_node(node->children, "active") && (body == NULL)) {
+                else if (xt_find_node(node->children, "active")) {
                         bud->flags |= JBFLAG_DOES_XEP85;
-                        imcb_buddy_typing(ic, from, 0);
+
+                        /* No need to send a "stopped typing" signal when there's a message. */
+                        if (body == NULL) {
+                                imcb_buddy_typing(ic, from, 0);
+                        }
                 } else if (xt_find_node(node->children, "paused")) {
                         bud->flags |= JBFLAG_DOES_XEP85;

protocols/jabber/s5bytestream.c

@@ -85 +85 @@
                 return jabber_bs_abort(bt, msg ": %s", strerror(errno)); }
 
-gboolean jabber_bs_abort(struct bs_transfer *bt, char *format, ...);
+gboolean jabber_bs_abort(struct bs_transfer *bt, char *format, ...) G_GNUC_PRINTF(2, 3);
 void jabber_bs_canceled(file_transfer_t *ft, char *reason);
 void jabber_bs_free_transfer(file_transfer_t *ft);
@@ -536 +536 @@
                  * that sends atyp=0 addrlen=0 and only 6 bytes (one less than one would expect).
                  * Therefore I removed the wait for more bytes. Since we don't care about what else the proxy
-                 * is sending, it shouldnt matter */
+                 * is sending, it should not matter */
 
                 if (bt->tf->ft->sending) {
@@ -559 +559 @@
  * An intelligent sender would probably specify himself as the first streamhost and
  * a proxy as the second (Kopete and PSI are examples here). That way, a (potentially)
- * slow proxy is only used if neccessary. This of course also means, that the timeout
+ * slow proxy is only used if necessary. This of course also means, that the timeout
  * per streamhost should be kept short. If one or two firewalled adresses are specified,
  * they have to timeout first before a proxy is tried.

protocols/jabber/sasl.c

@@ -54 +54 @@
         struct xt_node *c, *reply;
         char *s;
-        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0;
-        int want_oauth = FALSE, want_hipchat = FALSE;
+        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_fb = 0, sup_anonymous = 0;
+        int want_oauth = FALSE, want_hipchat = FALSE, want_anonymous = FALSE;
         GString *mechs;
 
@@ -74 +74 @@
         }
 
+        want_anonymous = set_getbool(&ic->acc->set, "anonymous");
         want_oauth = set_getbool(&ic->acc->set, "oauth");
         want_hipchat = (jd->flags & JFLAG_HIPCHAT);
@@ -84 +85 @@
                 } else if (c->text && g_strcasecmp(c->text, "DIGEST-MD5") == 0) {
                         sup_digest = 1;
+                } else if (c->text && g_strcasecmp(c->text, "ANONYMOUS") == 0) {
+                        sup_anonymous = 1;
                 } else if (c->text && g_strcasecmp(c->text, "X-OAUTH2") == 0) {
                         sup_gtalk = 1;
@@ -142 +145 @@
                 xt_free_node(reply);
                 return XT_ABORT;
-        } else if (sup_digest) {
+        } else if (want_anonymous && sup_anonymous) {
+                xt_add_attr(reply, "mechanism", "ANONYMOUS");
+
+                /* Well, that was easy. */
+        } else if (want_anonymous) {
+                imcb_error(ic, "Anonymous login requested, but not supported by server");
+                imc_logout(ic, FALSE);
+                xt_free_node(reply);
+                return XT_ABORT;
+        } else if (sup_digest && !(jd->ssl && sup_plain)) {
+                /* Only try DIGEST-MD5 if there's no SSL/TLS or if PLAIN isn't supported.
+                 * Which in practice means "don't bother with DIGEST-MD5 most of the time".
+                 * It's weak, pointless over TLS, and often breaks with some servers (hi openfire) */
+
                 xt_add_attr(reply, "mechanism", "DIGEST-MD5");
 

protocols/jabber/si.c

@@ -186 +186 @@
         jd->filetransfers = g_slist_prepend(jd->filetransfers, tf);
 
-        /* query buddy's features and server's streaming proxies if neccessary */
+        /* query buddy's features and server's streaming proxies if necessary */
 
         if (!tf->bud->features) {
@@ -283 +283 @@
 
         if (requestok) {
-                /* Figure out who the transfer should come frome... */
+                /* Figure out who the transfer should come from... */
 
                 ext_jid = ini_jid;
@@ -403 +403 @@
          * <iq from=... to=... id=...>
          *      <si xmlns=si>
-         *      [       <file xmlns=ft/>    ] <-- not neccessary
+         *      [       <file xmlns=ft/>    ] <-- not necessary
          *              <feature xmlns=feature>
          *                      <x xmlns=xdata type=submit>

protocols/msn/ns.c

@@ -39 +39 @@
 static void msn_ns_send_adl(struct im_connection *ic);
 static void msn_ns_structured_message(struct msn_data *md, char *msg, int msglen, char **cmd);
-static void msn_ns_sdg(struct msn_data *md, char *who, char **parts, char *action);
+static void msn_ns_sdg(struct msn_data *md, char *who, char **parts, char *action, gboolean selfmessage);
 static void msn_ns_nfy(struct msn_data *md, char *who, char **parts, char *action, gboolean is_put);
 
@@ -475 +475 @@
 }
 
+/* returns newly allocated string */
+static char *msn_ns_parse_header_address(struct msn_data *md, char *headers, char *header_name)
+{
+        char *semicolon = NULL;
+        char *header = NULL;
+        char *address = NULL;
+
+        if (!(header = get_rfc822_header(headers, header_name, 0))) {
+                return NULL;
+        }
+
+        /* either the semicolon or the end of the string */
+        semicolon = strchr(header, ';') ? : (header + strlen(header));
+
+        address = g_strndup(header + 2, semicolon - header - 2);
+
+        g_free(header);
+        return address;
+}
+
 static void msn_ns_structured_message(struct msn_data *md, char *msg, int msglen, char **cmd)
 {
         char **parts = NULL;
-        char *semicolon = NULL;
         char *action = NULL;
-        char *from = NULL;
         char *who = NULL;
+        gboolean selfmessage = FALSE;
 
         parts = g_strsplit(msg, "\r\n\r\n", 4);
 
-        if (!(from = get_rfc822_header(parts[0], "From", 0))) {
+        if (!(who = msn_ns_parse_header_address(md, parts[0], "From"))) {
                 goto cleanup;
         }
 
-        /* either the semicolon or the end of the string */
-        semicolon = strchr(from, ';') ? : (from + strlen(from));
-
-        who = g_strndup(from + 2, semicolon - from - 2);
+        if (strcmp(who, md->ic->acc->user) == 0) {
+                selfmessage = TRUE;
+                g_free(who);
+                if (!(who = msn_ns_parse_header_address(md, parts[0], "To"))) {
+                        goto cleanup;
+                }
+        }
 
         if ((strcmp(cmd[0], "SDG") == 0) && (action = get_rfc822_header(parts[2], "Message-Type", 0))) {
-                msn_ns_sdg(md, who, parts, action);
+                msn_ns_sdg(md, who, parts, action, selfmessage);
 
         } else if ((strcmp(cmd[0], "NFY") == 0) && (action = get_rfc822_header(parts[2], "Uri", 0))) {
@@ -505 +527 @@
         g_strfreev(parts);
         g_free(action);
-        g_free(from);
         g_free(who);
 }
 
-static void msn_ns_sdg(struct msn_data *md, char *who, char **parts, char *action)
+static void msn_ns_sdg(struct msn_data *md, char *who, char **parts, char *action, gboolean selfmessage)
 {
         struct im_connection *ic = md->ic;
 
-        if (strcmp(action, "Control/Typing") == 0) {
+        if (strcmp(action, "Control/Typing") == 0 && !selfmessage) {
                 imcb_buddy_typing(ic, who, OPT_TYPING);
         } else if (strcmp(action, "Text") == 0) {
-                imcb_buddy_msg(ic, who, parts[3], 0, 0);
+                imcb_buddy_msg(ic, who, parts[3], selfmessage ? OPT_SELFMESSAGE : 0, 0);
         }
 }
@@ -595 +616 @@
         } else {
                 imcb_error(ic, "Error during Passport authentication: %s", error);
-                imc_logout(ic, TRUE);
+
+                /* don't reconnect with auth errors */
+                if (error && g_str_has_prefix(error, "wsse:FailedAuthentication")) {
+                        imc_logout(ic, FALSE);
+                } else {
+                        imc_logout(ic, TRUE);
+                }
         }
 }

protocols/msn/soap.c

@@ -327 +327 @@
         struct xt_node *code = xt_find_node(node->children, "faultcode");
         struct xt_node *string = xt_find_node(node->children, "faultstring");
+        struct xt_node *reqstatus = xt_find_path(node, "psf:pp/psf:reqstatus");
         struct xt_node *url;
 
@@ -335 +336 @@
                    url->text_len > 0) {
                 sd->redirect = g_strdup(url->text);
+        } else if (reqstatus && strcmp(reqstatus->text, "0x800488fe") == 0) {
+                char *msg = "Location blocked. Log in to live.com, go to recent activity and click 'this was me'";
+                sd->error = g_strdup_printf("%s (%s)", code->text, msg);
         } else {
                 sd->error = g_strdup_printf("%s (%s)", code->text, string && string->text_len ?
@@ -346 +350 @@
         { "wsse:BinarySecurityToken", "wst:RequestedSecurityToken", msn_soap_passport_sso_token },
         { "S:Fault", "S:Envelope", msn_soap_passport_failure },
+        { "S:Fault", "wst:RequestSecurityTokenResponse", msn_soap_passport_failure },
         { NULL, NULL, NULL }
 };

protocols/nogaim.c

@@ -735 +735 @@
 }
 
+/* Deprecated: using this function resulted in merging several handles accidentally
+ * Also the irc layer handles this decently nowadays */
 void imcb_clean_handle(struct im_connection *ic, char *handle)
 {
-        /* Accepts a handle and does whatever is necessary to make it
-           BitlBee-friendly. Currently this means removing everything
-           outside 33-127 (ASCII printable excl spaces), @ (only one
-           is allowed) and ! and : */
-        char out[strlen(handle) + 1];
-        int s, d;
-
-        s = d = 0;
-        while (handle[s]) {
-                if (handle[s] > ' ' && handle[s] != '!' && handle[s] != ':' &&
-                    (handle[s] & 0x80) == 0) {
-                        if (handle[s] == '@') {
-                                /* See if we got an @ already? */
-                                out[d] = 0;
-                                if (strchr(out, '@')) {
-                                        continue;
-                                }
-                        }
-
-                        out[d++] = handle[s];
-                }
-                s++;
-        }
-        out[d] = handle[s];
-
-        strcpy(handle, out);
-}
+}

protocols/nogaim.h

@@ -70 +70 @@
 #define OPT_PONGS       0x00010000 /* Service sends us keep-alives */
 #define OPT_PONGED      0x00020000 /* Received a keep-alive during last interval */
+#define OPT_SELFMESSAGE 0x00080000 /* A message sent by self from another location */
 
 /* ok. now the fun begins. first we create a connection structure */
@@ -325 +326 @@
 G_MODULE_EXPORT void imcb_buddy_action_response(bee_user_t *bu, const char *action, char * const args[], void *data);
 
-G_MODULE_EXPORT void imcb_buddy_typing(struct im_connection *ic, const char *handle, uint32_t flags);
+G_MODULE_EXPORT void imcb_buddy_typing(struct im_connection *ic, const char *handle, guint32 flags);
 G_MODULE_EXPORT struct bee_user *imcb_buddy_by_handle(struct im_connection *ic, const char *handle);
-G_MODULE_EXPORT void imcb_clean_handle(struct im_connection *ic, char *handle);
+
+G_GNUC_DEPRECATED G_MODULE_EXPORT void imcb_clean_handle(struct im_connection *ic, char *handle);
 
 /* Actions, or whatever. */

protocols/oscar/aim.h

@@ -871 +871 @@
  * SNAC Family: Internal Messages
  *
- * This isn't truely a SNAC family either, but using
+ * This isn't truly a SNAC family either, but using
  * these, we can integrated non-SNAC services into
  * the SNAC-centered libfaim callback structure.

protocols/oscar/auth.c

@@ -41 +41 @@
  * meaning you generally never call this.
  *
- * But there are times when something might want it seperate. Specifically,
+ * But there are times when something might want it separate. Specifically,
  * libfaim sends this internally when doing SNAC login.
  *

protocols/oscar/conn.c

@@ -15 +15 @@
  * In OSCAR, every connection has a set of SNAC groups associated
  * with it.  These are the groups that you can send over this connection
- * without being guarenteed a "Not supported" SNAC error.
+ * without being guaranteed a "Not supported" SNAC error.
  *
  * The grand theory of things says that these associations transcend
@@ -36 +36 @@
  *
  * Here comes the good bit.  Without even letting anyone know, particularly
- * the module that decided to send this SNAC, and definitly not that twit
+ * the module that decided to send this SNAC, and definitely not that twit
  * in Greenland, you send out a service request.  In this request, you have
  * marked the need for a connection supporting group 0x000e.  A few seconds
@@ -317 +317 @@
 
         if (deadconn->fd >= 3) {
-                closesocket(deadconn->fd);
+                proxy_disconnect(deadconn->fd);
         }
         deadconn->fd = -1;

protocols/oscar/im.c

@@ -50 +50 @@
  * encoding for your message.  In UNICODE mode, _all_ characters must
  * occupy 16bits, including ones that are not special.  (Remember that
- * the first 128 UNICODE symbols are equivelent to ASCII7, however they
+ * the first 128 UNICODE symbols are equivalent to ASCII7, however they
  * must be prefixed with a zero high order byte.)
  *
@@ -64 +64 @@
  * in all of libfaim, it is written with performance in mind.  As such,
  * it is not as clear as it could be in respect to how this message is
- * supposed to be layed out. Most obviously, tlvlists should be used
+ * supposed to be laid out. Most obviously, tlvlists should be used
  * instead of writing out the bytes manually.
  *
@@ -476 +476 @@
  * examples of how to do this.
  *
- * I would definitly recommend avoiding this feature unless you really
+ * I would definitely recommend avoiding this feature unless you really
  * know what you are doing, and/or you have something neat to do with it.
  *
@@ -638 +638 @@
                         }
 #if 0
-                        /* XXX this isn't really necesary... */
+                        /* XXX this isn't really necessary... */
                         if (((args.flag1 != 0x0000) &&
                              (args.flag1 != 0x0002) &&
@@ -1161 +1161 @@
          *
          * Channel 0x0001 is the message channel.  There are
-         * other channels for things called "rendevous"
+         * other channels for things called "rendezvous"
          * which represent chat and some of the other new
          * features of AIM2/3/3.5.
          *
-         * Channel 0x0002 is the Rendevous channel, which
+         * Channel 0x0002 is the Rendezvous channel, which
          * is where Chat Invitiations and various client-client
          * connection negotiations come from.
@@ -1181 +1181 @@
          * with the TLVs read below, they are two different pieces.  The
          * userinfo block contains the number of TLVs that contain user
-         * information, the rest are not even though there is no seperation.
+         * information, the rest are not even though there is no separation.
          * aim_extractuserinfo() returns the number of bytes used by the
          * userinfo tlvs, so you can start reading the rest of them right
@@ -1253 +1253 @@
 /*
  *
- * I definitly recommend sending this.  If you don't, you'll be stuck
+ * I definitely recommend sending this.  If you don't, you'll be stuck
  * with the rather unreasonable defaults.  You don't want those.  Send this.
  *

protocols/oscar/misc.c

@@ -3 +3 @@
  * aim_misc.c
  *
- * TODO: Seperate a lot of this into an aim_bos.c.
+ * TODO: Separate a lot of this into an aim_bos.c.
  *
  * Other things...

protocols/oscar/msgcookie.c

@@ -142 +142 @@
  * @cookiep: the address of a pointer to the cookie struct to remove
  *
- * this function removes the cookie *cookie from teh list of cookies
+ * this function removes the cookie *cookie from the list of cookies
  * in sess, and then frees all memory associated with it. including
  * its data! if you want to use the private data after calling this,

protocols/oscar/oscar.c

@@ -456 +456 @@
                         b_event_remove(n->inpa);
                 }
+                n->inpa = 0;
                 g_free(n->name);
                 g_free(n->show);
@@ -481 +482 @@
         if (ic->inpa > 0) {
                 b_event_remove(ic->inpa);
+                ic->inpa = 0;
         }
         if (odata->cnpa > 0) {
                 b_event_remove(odata->cnpa);
+                odata->cnpa = 0;
         }
         if (odata->paspa > 0) {
                 b_event_remove(odata->paspa);
+                odata->paspa = 0;
         }
         aim_session_kill(odata->sess);
@@ -637 +641 @@
         aim_sendcookie(sess, bosconn, info->cookie);
         b_event_remove(ic->inpa);
+        ic->inpa = 0;
 
         return 1;
@@ -1261 +1266 @@
         } break;
 
-        case 2: {         /* rendevous */
+        case 2: {         /* rendezvous */
                 struct aim_incomingim_ch2_args *args;
                 args = va_arg(ap, struct aim_incomingim_ch2_args *);
@@ -2586 +2591 @@
         if (cc->inpa > 0) {
                 b_event_remove(cc->inpa);
+                cc->inpa = 0;
         }
         aim_conn_kill(od->sess, &cc->conn);

protocols/oscar/rxhandlers.c

@@ -381 +381 @@
         /*
          * This doesn't have to be called here.  It could easily be done
-         * by a seperate thread or something. It's an administrative operation,
+         * by a separate thread or something. It's an administrative operation,
          * and can take a while. Though the less you call it the less memory
          * you'll have :)

protocols/oscar/rxqueue.c

@@ -361 +361 @@
 /*
  * Grab a single command sequence off the socket, and enqueue
- * it in the incoming event queue in a seperate struct.
+ * it in the incoming event queue in a separate struct.
  */
 int aim_get_command(aim_session_t *sess, aim_conn_t *conn)
@@ -479 +479 @@
 
 /*
- * Purge recieve queue of all handled commands (->handled==1).  Also
+ * Purge receive queue of all handled commands (->handled==1).  Also
  * allows for selective freeing using ->nofree so that the client can
  * keep the data for various purposes.

protocols/oscar/service.c

@@ -157 +157 @@
 
 /*
- * OSCAR defines several 'rate classes'.  Each class has seperate
+ * OSCAR defines several 'rate classes'.  Each class has separate
  * rate limiting properties (limit level, alert level, disconnect
  * level, etc), and a set of SNAC family/type pairs associated with
@@ -709 +709 @@
  * of memory.  (I won't put it past them to start requesting data in
  * less static regions -- regions that are initialized at run time, but still
- * before the client recieves this request.)
- *
- * When the client recieves the request, it adds it to the current ds
+ * before the client receives this request.)
+ *
+ * When the client receives the request, it adds it to the current ds
  * (0x00400000) and dereferences it, copying the data into a buffer which
  * it then runs directly through the MD5 hasher.  The 16 byte output of
@@ -723 +723 @@
  *     download a FREE, fully featured, and authorized client, here
  *     http://www.aol.com/aim/download2.html"
- * The connection is then closed, recieving disconnect code 1, URL
+ * The connection is then closed, receiving disconnect code 1, URL
  * http://www.aim.aol.com/errors/USER_LOGGED_OFF_NEW_LOGIN.html.
  *
  * Note, however, that numerous inconsistencies can cause the above error,
- * not just sending back a bad hash.  Do not immediatly suspect this code
+ * not just sending back a bad hash.  Do not immediately suspect this code
  * if you get disconnected.  AOL and the open/free software community have
  * played this game for a couple years now, generating the above message
- * on numerous ocassions.
+ * on numerous occasions.
  *
  * Anyway, neener.  We win again.

protocols/oscar/tlv.c

@@ -25 +25 @@
  * bstream references, so that at least the ->value portion of each
  * element doesn't need to be malloc/memcpy'd.  This could prove to be
- * just as effecient as the in-place TLV parsing used in a couple places
+ * just as efficient as the in-place TLV parsing used in a couple places
  * in libfaim.
  *
@@ -135 +135 @@
 /**
  * aim_addtlvtochain_str - Add a string to a TLV chain
- * @list: Desination chain (%NULL pointer if empty)
+ * @list: Designation chain (%NULL pointer if empty)
  * @type: TLV type
  * @str: String to add

protocols/oscar/txqueue.c

@@ -67 +67 @@
  * The overall purpose here is to enqueue the passed in command struct
  * into the outgoing (tx) queue.  Basically...
- *   1) Make a scope-irrelevent copy of the struct
+ *   1) Make a scope-irrelevant copy of the struct
  *   3) Mark as not-sent-yet
  *   4) Enqueue the struct into the list

protocols/purple/purple.c

@@ -113 +113 @@
            servers anyway! */
         if (!dir_fixed) {
+                PurpleCertificatePool *pool;
                 irc_t *irc = acc->bee->ui_data;
                 char *dir;
@@ -122 +123 @@
                 purple_blist_load();
                 purple_prefs_load();
+
+                if (proxytype == PROXY_SOCKS4A) {
+                        /* do this here after loading prefs. yes, i know, it sucks */
+                        purple_prefs_set_bool("/purple/proxy/socks4_remotedns", TRUE);
+                }
+
+                /* re-create the certificate cache directory */
+                pool = purple_certificate_find_pool("x509", "tls_peers");
+                dir = purple_certificate_pool_mkpath(pool, NULL);
+                purple_build_dir(dir, 0700);
+
                 dir_fixed = TRUE;
         }
@@ -1404 +1416 @@
                 PurpleProxyInfo *pi = purple_global_proxy_get_info();
                 switch (proxytype) {
+                case PROXY_SOCKS4A:
                 case PROXY_SOCKS4:
                         purple_proxy_info_set_type(pi, PURPLE_PROXY_SOCKS4);

protocols/skype/README

@@ -203 +203 @@
 
   * `account skype set skypeconsole_receive true` will make the
-    `skypeconsole` account dump all the recieved raw traffic for you
+    `skypeconsole` account dump all the received raw traffic for you
 
 - If you want to automatically join bookmarked groupchats right after

protocols/skype/skype.c

@@ -21 +21 @@
 
 #define _XOPEN_SOURCE
-#define _BSD_SOURCE
 #include <poll.h>
 #include <stdio.h>
@@ -188 +187 @@
 
         va_start(args, fmt);
-        vsnprintf(str, IRC_LINE_SIZE, fmt, args);
+        g_vsnprintf(str, IRC_LINE_SIZE, fmt, args);
         va_end(args);
 
@@ -322 +321 @@
         }
         return NULL;
+}
+
+static struct groupchat *skype_chat_get_or_create(struct im_connection *ic, char *id)
+{
+        struct skype_data *sd = ic->proto_data;
+        struct groupchat *gc = bee_chat_by_title(ic->bee, ic, id);
+
+        if (!gc) {
+                gc = imcb_chat_new(ic, id);
+                imcb_chat_name_hint(gc, id);
+                imcb_chat_add_buddy(gc, sd->username);
+
+                skype_printf(ic, "GET CHAT %s ADDER\n", id);
+                skype_printf(ic, "GET CHAT %s TOPIC\n", id);
+                skype_printf(ic, "GET CHAT %s ACTIVEMEMBERS\n", id);
+        }
+
+        return gc;
 }
 
@@ -688 +705 @@
                 info += 9;
                 if (sd->handle && sd->body && sd->type) {
-                        struct groupchat *gc = bee_chat_by_title(ic->bee, ic, info);
+                        struct groupchat *gc = skype_chat_get_or_create(ic, info);
                         int i;
                         for (i = 0; i < g_list_length(sd->body); i++) {
@@ -1026 +1043 @@
         }
         if (!strcmp(info, "STATUS MULTI_SUBSCRIBED")) {
-                gc = bee_chat_by_title(ic->bee, ic, id);
-                if (!gc) {
-                        gc = imcb_chat_new(ic, id);
-                        imcb_chat_name_hint(gc, id);
-                }
-                skype_printf(ic, "GET CHAT %s ADDER\n", id);
-                skype_printf(ic, "GET CHAT %s TOPIC\n", id);
+                skype_chat_get_or_create(ic, id);
         } else if (!strcmp(info, "STATUS DIALOG") && sd->groupchat_with) {
-                gc = imcb_chat_new(ic, id);
-                imcb_chat_name_hint(gc, id);
+                gc = skype_chat_get_or_create(ic, id);
                 /* According to the docs this
                  * is necessary. However it
@@ -1046 +1056 @@
                            sd->groupchat_with);
                 imcb_chat_add_buddy(gc, buf);
-                imcb_chat_add_buddy(gc, sd->username);
                 g_free(sd->groupchat_with);
                 sd->groupchat_with = NULL;
-                skype_printf(ic, "GET CHAT %s ADDER\n", id);
-                skype_printf(ic, "GET CHAT %s TOPIC\n", id);
         } else if (!strcmp(info, "STATUS UNSUBSCRIBED")) {
                 gc = bee_chat_by_title(ic->bee, ic, id);
@@ -1257 +1264 @@
                 }
                 g_strfreev(lines);
-        } else if (st == 0 || (st < 0 && !sockerr_again())) {
+        } else if (st == 0 || (st < 0 && !ssl_sockerr_again(sd->ssl))) {
                 ssl_disconnect(sd->ssl);
                 sd->fd = -1;

protocols/skype/t/add-yes-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/skype/t/added-no-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/skype/t/added-yes-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/skype/t/away-set-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/skype/t/call-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :alice

protocols/skype/t/call-failed-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :alice

protocols/skype/t/called-no-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/skype/t/called-yes-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/skype/t/ctcp-help-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/skype/t/filetransfer-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/skype/t/group-add-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/skype/t/group-read-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/skype/t/groupchat-invite-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice
@@ -7 +7 @@
 >> :bob!bob@skype.com JOIN :&bitlbee
 << PRIVMSG &bitlbee :chat with bob
->> 353 alice = ##alice/$bob;a7ab206ec780 :@alice bob @root
-<< INVITE cecil ##alice/$bob;a7ab206ec780
->> cecil@skype.com JOIN :##alice/$bob;a7ab206ec780
+>> 353 alice = ##alice/$bob;a7ab206ec78 :@alice @root
+<< INVITE cecil ##alice/$bob;a7ab206ec78
+>> cecil@skype.com JOIN :##alice/$bob;a7ab206ec78

protocols/skype/t/groupchat-invite-skyped.mock

@@ -26 +26 @@
 >> GET CHAT #alice/$bob;a7ab206ec78060f1 TOPIC
 << CHAT #alice/$bob;a7ab206ec78060f1 TOPIC 
+>> GET CHAT #alice/$bob;a7ab206ec78060f1 ACTIVEMEMBERS
+<< CHAT #alice/$bob;a7ab206ec78060f1 ACTIVEMEMBERS
 << CHATMESSAGE 206 STATUS SENDING
 << CHAT #alice/$bob;a7ab206ec78060f1 STATUS DIALOG

protocols/skype/t/groupchat-invited-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice
@@ -5 +5 @@
 << PRIVMSG &bitlbee :account add skype alice foo
 << PRIVMSG &bitlbee :account skype on
->> JOIN :##cecil/$bob;4d8cc9965791
->> 353 alice = ##cecil/$bob;4d8cc9965791 :@alice bob cecil @root
+>> JOIN :##cecil/$bob;4d8cc996579
+>> 353 alice = ##cecil/$bob;4d8cc996579 :@alice @root

protocols/skype/t/groupchat-leave-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice
@@ -6 +6 @@
 << PRIVMSG &bitlbee :account skype set skypeconsole_receive true
 << PRIVMSG &bitlbee :account skype on
->> JOIN :##cecil/$bob;4d8cc9965791
->> 353 alice = ##cecil/$bob;4d8cc9965791 :@alice bob cecil @root
-<< PART ##cecil/$bob;4d8cc9965791
+>> JOIN :##cecil/$bob;4d8cc996579
+>> 353 alice = ##cecil/$bob;4d8cc996579 :@alice @root
+<< PART ##cecil/$bob;4d8cc996579
 >> PRIVMSG &bitlbee :alice: CHAT #cecil/$bob;4d8cc9965791c6b9 STATUS UNSUBSCRIBED

protocols/skype/t/groupchat-leave-skyped.mock

@@ -36 +36 @@
 >> GET CHAT #cecil/$bob;4d8cc9965791c6b9 TOPIC
 << CHAT #cecil/$bob;4d8cc9965791c6b9 TOPIC 
->> GET CHAT #cecil/$bob;4d8cc9965791c6b9 ADDER
-<< CHAT #cecil/$bob;4d8cc9965791c6b9 ADDER bob
->> GET CHAT #cecil/$bob;4d8cc9965791c6b9 TOPIC
-<< CHAT #cecil/$bob;4d8cc9965791c6b9 TOPIC 
->> GET CHAT #cecil/$bob;4d8cc9965791c6b9 ADDER
-<< CHAT #cecil/$bob;4d8cc9965791c6b9 ADDER bob
->> GET CHAT #cecil/$bob;4d8cc9965791c6b9 TOPIC
-<< CHAT #cecil/$bob;4d8cc9965791c6b9 TOPIC 
+>> GET CHAT #cecil/$bob;4d8cc9965791c6b9 ACTIVEMEMBERS
+<< CHAT #cecil/$bob;4d8cc9965791c6b9 ACTIVEMEMBERS
 >> GET CHATMESSAGE 188 FROM_HANDLE
 << CHATMESSAGE 188 FROM_HANDLE bob

protocols/skype/t/groupchat-msg-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice
@@ -6 +6 @@
 << PRIVMSG &bitlbee :account skype set skypeconsole_receive true
 << PRIVMSG &bitlbee :account skype on
->> JOIN :##cecil/$bob;4d8cc9965791
->> 353 alice = ##cecil/$bob;4d8cc9965791 :@alice bob cecil @root
-<< PRIVMSG ##cecil/$bob;4d8cc9965791 :hello
+>> JOIN :##cecil/$bob;4d8cc996579
+>> 353 alice = ##cecil/$bob;4d8cc996579 :@alice @root
+<< PRIVMSG ##cecil/$bob;4d8cc996579 :hello
 >> PRIVMSG &bitlbee :alice: CHAT #cecil/$bob;4d8cc9965791c6b9 ACTIVITY_TIMESTAMP

protocols/skype/t/groupchat-msg-skyped.mock

@@ -36 +36 @@
 >> GET CHAT #cecil/$bob;4d8cc9965791c6b9 TOPIC
 << CHAT #cecil/$bob;4d8cc9965791c6b9 TOPIC 
->> GET CHAT #cecil/$bob;4d8cc9965791c6b9 ADDER
-<< CHAT #cecil/$bob;4d8cc9965791c6b9 ADDER bob
->> GET CHAT #cecil/$bob;4d8cc9965791c6b9 TOPIC
-<< CHAT #cecil/$bob;4d8cc9965791c6b9 TOPIC 
->> GET CHAT #cecil/$bob;4d8cc9965791c6b9 ADDER
-<< CHAT #cecil/$bob;4d8cc9965791c6b9 ADDER bob
->> GET CHAT #cecil/$bob;4d8cc9965791c6b9 TOPIC
-<< CHAT #cecil/$bob;4d8cc9965791c6b9 TOPIC 
+>> GET CHAT #cecil/$bob;4d8cc9965791c6b9 ACTIVEMEMBERS
+<< CHAT #cecil/$bob;4d8cc9965791c6b9 ACTIVEMEMBERS bob cecil alice
 >> GET CHATMESSAGE 188 FROM_HANDLE
 << CHATMESSAGE 188 FROM_HANDLE bob

protocols/skype/t/groupchat-topic-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice
@@ -5 +5 @@
 << PRIVMSG &bitlbee :account add skype alice foo
 << PRIVMSG &bitlbee :account skype on
->> JOIN :##cecil/$bob;4d8cc9965791
->> 353 alice = ##cecil/$bob;4d8cc9965791 :@alice bob cecil @root
-<< TOPIC ##cecil/$bob;4d8cc9965791 :topic
->> TOPIC ##cecil/$bob;4d8cc9965791 :topic
+>> JOIN :##cecil/$bob;4d8cc996579
+>> 353 alice = ##cecil/$bob;4d8cc996579 :@alice @root
+<< TOPIC ##cecil/$bob;4d8cc996579 :topic
+>> TOPIC ##cecil/$bob;4d8cc996579 :topic

protocols/skype/t/info-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/skype/t/login-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/skype/t/msg-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/skype/t/set-mood-text-bitlbee.mock

@@ -1 @@
->> NOTICE AUTH
+>> NOTICE *
 << NICK alice
 << USER alice alice localhost :Alice

protocols/twitter/twitter.c

@@ -678 +678 @@
         ic->flags &= ~OPT_LOGGED_IN;
 
-        // Remove the main_loop function from the function queue.
-        b_event_remove(td->main_loop_id);
-
-        if (td->timeline_gc) {
-                imcb_chat_free(td->timeline_gc);
-        }
-
         if (td) {
+                // Remove the main_loop function from the function queue.
+                b_event_remove(td->main_loop_id);
+
+                if (td->timeline_gc) {
+                        imcb_chat_free(td->timeline_gc);
+                }
+
                 if (td->filter_update_id > 0) {
                         b_event_remove(td->filter_update_id);
@@ -1012 +1012 @@
                         twitter_log(ic, "Tweet `%s' does not exist", cmd[1]);
                 } else {
-                        /* More common link is twitter.com/$UID/status/$ID (and that's
-                         * what this will 302 to) but can't generate that since for RTs,
-                         * bu here points at the retweeter while id contains the id of
-                         * the original message. */
-                        twitter_log(ic, "https://twitter.com/statuses/%lld", id);
+                        twitter_status_show_url(ic, id);
                 }
                 goto eof;

protocols/twitter/twitter_http.c

@@ -24 +24 @@
 /***************************************************************************\
 *                                                                           *
-*  Some funtions within this file have been copied from other files within  *
+*  Some functions within this file have been copied from other files within  *
 *  BitlBee.                                                                 *
 *                                                                           *
@@ -53 +53 @@
         char *tmp;
         GString *request = g_string_new("");
-        void *ret;
+        void *ret = NULL;
         char *url_arguments;
         url_t *base_url = NULL;
@@ -72 +72 @@
                 base_url = g_new0(url_t, 1);
                 if (!url_set(base_url, url_string)) {
-                        g_free(base_url);
-                        return NULL;
+                        goto error;
                 }
         }
@@ -132 +131 @@
         }
 
+error:
         g_free(url_arguments);
         g_string_free(request, TRUE);

protocols/twitter/twitter_lib.c

@@ -312 +312 @@
         td = ic->proto_data;
 
+        // Parse the data.
+        if (!(parsed = twitter_parse_response(ic, req))) {
+                return;
+        }
+
         txl = g_new0(struct twitter_xml_list, 1);
         txl->list = td->follow_ids;
-
-        // Parse the data.
-        if (!(parsed = twitter_parse_response(ic, req))) {
-                return;
-        }
 
         twitter_xt_get_friends_id_list(parsed, txl);
@@ -388 +388 @@
         }
 
+        // Get the user list from the parsed xml feed.
+        if (!(parsed = twitter_parse_response(ic, req))) {
+                return;
+        }
+
         txl = g_new0(struct twitter_xml_list, 1);
         txl->list = NULL;
 
-        // Get the user list from the parsed xml feed.
-        if (!(parsed = twitter_parse_response(ic, req))) {
-                return;
-        }
         twitter_xt_get_users(parsed, txl);
         json_value_free(parsed);
@@ -1385 +1386 @@
         td = ic->proto_data;
 
-        txl = g_new0(struct twitter_xml_list, 1);
-        txl->list = NULL;
-
         // The root <statuses> node should hold the list of statuses <status>
         if (!(parsed = twitter_parse_response(ic, req))) {
                 goto end;
         }
+
+        txl = g_new0(struct twitter_xml_list, 1);
+        txl->list = NULL;
+
         twitter_xt_get_status_list(ic, parsed, txl);
         json_value_free(parsed);
@@ -1424 +1426 @@
         td = ic->proto_data;
 
-        txl = g_new0(struct twitter_xml_list, 1);
-        txl->list = NULL;
-
         // The root <statuses> node should hold the list of statuses <status>
         if (!(parsed = twitter_parse_response(ic, req))) {
                 goto end;
         }
+
+        txl = g_new0(struct twitter_xml_list, 1);
+        txl->list = NULL;
+
         twitter_xt_get_status_list(ic, parsed, txl);
         json_value_free(parsed);
@@ -1573 +1576 @@
         g_free(args[1]);
 }
+
+static void twitter_http_status_show_url(struct http_request *req)
+{
+        struct im_connection *ic = req->data;
+        json_value *parsed, *id;
+        const char *name;
+
+        // Check if the connection is still active.
+        if (!g_slist_find(twitter_connections, ic)) {
+                return;
+        }
+
+        if (!(parsed = twitter_parse_response(ic, req))) {
+                return;
+        }
+
+        /* for the parson branch:
+        name = json_object_dotget_string(json_object(parsed), "user.screen_name");
+        id = json_object_get_integer(json_object(parsed), "id");
+        */
+
+        name = json_o_str(json_o_get(parsed, "user"), "screen_name");
+        id = json_o_get(parsed, "id");
+
+        if (name && id && id->type == json_integer) {
+                twitter_log(ic, "https://twitter.com/%s/status/%" G_GUINT64_FORMAT, name, id->u.integer);
+        } else {
+                twitter_log(ic, "Error: could not fetch tweet url.");
+        }
+
+        json_value_free(parsed);
+}
+
+void twitter_status_show_url(struct im_connection *ic, guint64 id)
+{
+        char *url = g_strdup_printf("%s%" G_GUINT64_FORMAT "%s", TWITTER_STATUS_SHOW_URL, id, ".json");
+        twitter_http(ic, url, twitter_http_status_show_url, ic, 0, NULL, 0);
+        g_free(url);
+}

protocols/twitter/twitter_lib.h

@@ -96 +96 @@
 void twitter_report_spam(struct im_connection *ic, char *screen_name);
 void twitter_favourite_tweet(struct im_connection *ic, guint64 id);
+void twitter_status_show_url(struct im_connection *ic, guint64 id);
 
 #endif //_TWITTER_LIB_H

protocols/yahoo/libyahoo2.c

@@ -12 +12 @@
  * GNU GPL.
  *
- * This code is derivitive of Gaim <http://gaim.sourceforge.net>
+ * This code is derivative of Gaim <http://gaim.sourceforge.net>
  * copyright (C) 1998-1999, Mark Spencer <markster@marko.net>
  *             1998-1999, Adam Fritzler <afritz@marko.net>
@@ -1402 +1402 @@
 
         /*
-         * Status updates may be spread accross multiple packets and not
+         * Status updates may be spread across multiple packets and not
          * even on buddy boundaries, so keeping some state is important.
          * So, continue where we left off, and only add a user entry to

protocols/yahoo/yahoo.c

@@ -440 +440 @@
 {
         struct byahoo_connect_callback_data *d = data;
-
-        if (!byahoo_get_ic_by_id(d->id)) {
+        struct im_connection *ic;
+
+        if (!(ic = byahoo_get_ic_by_id(d->id))) {
+                g_free(d);
+                return;
+        }
+
+        if (source == -1) {
+                d->callback(NULL, 0, d->data);
+                imcb_error(ic, "Could not connect to server");
+                imc_logout(ic, TRUE);
                 g_free(d);
                 return;

protocols/yahoo/yahoo2_callbacks.h

@@ -685 +685 @@
  * Name: ext_yahoo_connect_async
  *      Connect to a host:port asynchronously. This function should return
- *      immediately returing a tag used to identify the connection handler,
+ *      immediately returning a tag used to identify the connection handler,
  *      or a pre-connect error (eg: host name lookup failure).
  *      Once the connect completes (successfully or unsuccessfully), callback