Changeset b8c336b for protocols/jabber

Timestamp:

2015-05-09T19:50:30Z (10 years ago)

Author:

dequis <dx@…>

Children:

ec8b369

Parents:

356e2dd (diff), 5014380 (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 'develop' into feat/hip-cat

Conflicts:

protocols/jabber/hipchat.c
protocols/jabber/iq.c
protocols/jabber/jabber.h

Location:

protocols/jabber

Files:

• hipchat.c (modified) (2 diffs)
• iq.c (modified) (3 diffs)
• jabber.c (modified) (1 diff)

protocols/jabber/hipchat.c

@@ -47 +47 @@
         jd->flags &= ~JFLAG_STREAM_RESTART;
 
-        if (!jabber_get_roster(ic)) {
-                return XT_ABORT;
-        }
-        if (!jabber_iq_disco_server(ic)) {
-                return XT_ABORT;
-        }
-        if (!jabber_get_hipchat_profile(ic)) {
-                return XT_ABORT;
-        }
-        if (!jabber_iq_disco_muc(ic, muc_host)) {
+        if (!jabber_get_roster(ic) ||
+            !jabber_iq_disco_server(ic) ||
+            !jabber_get_hipchat_profile(ic) ||
+            !jabber_iq_disco_muc(ic, muc_host)) {
                 return XT_ABORT;
         }
@@ -84 +78 @@
 {
         struct xt_node *query, *name_node;
-
-        //char *name;
 
         if (!(query = xt_find_node(node->children, "query"))) {

protocols/jabber/iq.c

@@ -373 +373 @@
 static xt_status jabber_parse_roster(struct im_connection *ic, struct xt_node *node, struct xt_node *orig)
 {
+        struct jabber_data *jd = ic->proto_data;
         struct xt_node *query, *c;
         int initial = (orig != NULL);
@@ -388 +389 @@
                 char *sub = xt_find_attr(c, "subscription");
                 char *mention_name = xt_find_attr(c, "mention_name");
-                char *nick = mention_name ? : name;
 
                 if (jid && sub) {
@@ -399 +399 @@
                                 }
 
-                                if (nick) {
-                                        imcb_buddy_nick_hint(ic, jid, nick);
+                                /* This could also be used to set the full name as nick for fb/gtalk,
+                                 * but i'm keeping the old (ugly?) default behavior just to be safe */
+                                if (mention_name && (jd->flags & JFLAG_HIPCHAT)) {
+                                        imcb_buddy_nick_hint(ic, jid, mention_name);
                                 }
                         } else if (strcmp(sub, "remove") == 0) {

protocols/jabber/jabber.c

@@ -428 +428 @@
         }
 
-        jabber_get_vcard(ic, bud ? bud->full_jid : who);
+        jabber_get_vcard(ic, who);
 }