aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/jabber/conference.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2007-06-04 16:56:09 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2007-06-04 16:56:09 +0100
commitc570c86bd6c08c77d851ac81a9603dcd13c7804a (patch)
tree68e01019de2e535ac5e324f6676c32853e971cfa /protocols/jabber/conference.c
parente0e2a71ed3e7937ed5da85af95be016a8441547b (diff)
Calling imcb_add_buddy() before setting the nickname. This is the only
way to set the nickname in time before BitlBee sends the JOIN.
Diffstat (limited to 'protocols/jabber/conference.c')
-rw-r--r--protocols/jabber/conference.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/protocols/jabber/conference.c b/protocols/jabber/conference.c
index b77e037b..09a63cbc 100644
--- a/protocols/jabber/conference.c
+++ b/protocols/jabber/conference.c
@@ -155,13 +155,16 @@ void jabber_chat_pkt_presence( struct im_connection *ic, struct jabber_buddy *bu
bud->flags |= JBFLAG_IS_ANONYMOUS;
}
+ if( bud != jc->me )
+ {
+ imcb_add_buddy( ic, bud->ext_jid, NULL );
+ imcb_buddy_nick_hint( ic, bud->ext_jid, bud->resource );
+ }
+
s = strchr( bud->ext_jid, '/' );
if( s ) *s = 0; /* Should NEVER be NULL, but who knows... */
imcb_chat_add_buddy( chat, bud->ext_jid );
if( s ) *s = '/';
-
- if( bud != jc->me )
- imcb_buddy_nick_hint( ic, bud->ext_jid, bud->resource );
}
else if( type ) /* This only gets called if type is NULL or "unavailable" */
{