Changes in protocols/jabber/iq.c [40cfbc5:5ebff60]

File:

• protocols/jabber/iq.c (modified) (5 diffs)

protocols/jabber/iq.c

@@ -27 +27 @@
 static xt_status jabber_parse_roster(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 static xt_status jabber_iq_display_vcard(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
+static int jabber_iq_disco_server(struct im_connection *ic);
 
 xt_status jabber_pkt_iq(struct xt_node *node, gpointer data)
@@ -373 +374 @@
 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 +388 @@
                 char *name = xt_find_attr(c, "name");
                 char *sub = xt_find_attr(c, "subscription");
-                char *mention_name = xt_find_attr(c, "mention_name");
 
                 if (jid && sub) {
@@ -397 +396 @@
                                 if (name) {
                                         imcb_rename_buddy(ic, jid, name);
-                                }
-
-                                /* 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) {
@@ -862 +855 @@
                                                  struct xt_node *node, struct xt_node *orig);
 
-int jabber_iq_disco_server(struct im_connection *ic)
+static int jabber_iq_disco_server(struct im_connection *ic)
 {
         struct xt_node *node, *iq;