aboutsummaryrefslogtreecommitdiffstats
path: root/protocols
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2007-12-02 23:14:49 +0000
committerWilmer van der Gaast <wilmer@gaast.net>2007-12-02 23:14:49 +0000
commit80e9db97776bfd6c6192135d65027abd8f50887c (patch)
tree57a8cb21362e52680b96b6f5eab0dee9337ef31c /protocols
parentfc5d06d4540894bafbc681c586f2b8aa5142357f (diff)
Forgot to return something in jabber_chat_join_failed().
Diffstat (limited to 'protocols')
-rw-r--r--protocols/jabber/conference.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/jabber/conference.c b/protocols/jabber/conference.c
index 72d7b5d8..c5bc0e68 100644
--- a/protocols/jabber/conference.c
+++ b/protocols/jabber/conference.c
@@ -72,7 +72,8 @@ static xt_status jabber_chat_join_failed( struct im_connection *ic, struct xt_no
char *room;
room = xt_find_attr( orig, "to" );
- bud = jabber_buddy_by_jid( ic, room, 0 );
+ if( ( bud = jabber_buddy_by_jid( ic, room, 0 ) ) )
+ jabber_chat_free( jabber_chat_by_jid( ic, bud->bare_jid ) );
err = jabber_error_parse( xt_find_node( node->children, "error" ), XMLNS_STANZA_ERROR );
if( err )
@@ -83,8 +84,7 @@ static xt_status jabber_chat_join_failed( struct im_connection *ic, struct xt_no
jabber_error_free( err );
}
- if( bud )
- jabber_chat_free( jabber_chat_by_jid( ic, bud->bare_jid ) );
+ return XT_HANDLED;
}
struct groupchat *jabber_chat_by_jid( struct im_connection *ic, const char *name )