aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Fixe rejoining room after nickname conflict

Browse Source 
fixes #241
This commit is contained in:
James Booth 2013-09-22 01:26:40 +01:00
parent 03703fa8f7
commit bf4c1a810f
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/muc.c
View File

@ -145,7 +145,9 @@ muc_join_room(const char * const room, const char * const nick)
void void
muc_leave_room(const char * const room) muc_leave_room(const char * const room)
{ {
g_hash_table_remove(rooms, room); if (rooms != NULL) {
g_hash_table_remove(rooms, room);
}
} }
/* /*

5
src/profanity.c
View File

@ -192,6 +192,11 @@ prof_handle_error_message(const char *from, const char *err_msg)
} else { } else {
cons_show_error("Error received from server: %s", err_msg); cons_show_error("Error received from server: %s", err_msg);
} }
// remove the room from muc
Jid *room_jid = jid_create(from);
muc_leave_room(room_jid->barejid);
jid_destroy(room_jid);
} else { } else {
cons_show_error("Error received from server: %s", err_msg); cons_show_error("Error received from server: %s", err_msg);
} }

10
src/xmpp/presence.c
View File

@ -303,10 +303,12 @@ presence_leave_chat_room(const char * const room_jid)
xmpp_conn_t *conn = connection_get_conn(); xmpp_conn_t *conn = connection_get_conn();
char *nick = muc_get_room_nick(room_jid); char *nick = muc_get_room_nick(room_jid);
xmpp_stanza_t *presence = stanza_create_room_leave_presence(ctx, room_jid, if (nick != NULL) {
nick); xmpp_stanza_t *presence = stanza_create_room_leave_presence(ctx, room_jid,
xmpp_send(conn, presence); nick);
xmpp_stanza_release(presence); xmpp_send(conn, presence);
xmpp_stanza_release(presence);
}
} }
static int static int