equal
deleted
inserted
replaced
250 return; |
250 return; |
251 } |
251 } |
252 |
252 |
253 if (buddy_gettype(BUDDATA(current_buddy)) != ROSTER_TYPE_ROOM) { |
253 if (buddy_gettype(BUDDATA(current_buddy)) != ROSTER_TYPE_ROOM) { |
254 // local part (UI, logging, etc.) |
254 // local part (UI, logging, etc.) |
255 hk_message_out(jid, 0, msg); |
255 hk_message_out(jid, NULL, 0, msg); |
256 } |
256 } |
257 |
257 |
258 // Network part |
258 // Network part |
259 jb_send_msg(jid, msg, buddy_gettype(BUDDATA(current_buddy)), NULL); |
259 jb_send_msg(jid, msg, buddy_gettype(BUDDATA(current_buddy)), NULL); |
260 } |
260 } |
691 else bare_jid = jid; |
691 else bare_jid = jid; |
692 |
692 |
693 // Jump to window, create one if needed |
693 // Jump to window, create one if needed |
694 scr_RosterJumpJid(bare_jid); |
694 scr_RosterJumpJid(bare_jid); |
695 |
695 |
|
696 // Check if we're sending a message to a conference room |
|
697 // If not, we must make sure p is NULL, for hk_message_out() |
|
698 if (p) { |
|
699 if (roster_find(bare_jid, jidsearch, ROSTER_TYPE_ROOM)) p++; |
|
700 else p = NULL; |
|
701 } |
|
702 |
696 // local part (UI, logging, etc.) |
703 // local part (UI, logging, etc.) |
697 hk_message_out(bare_jid, 0, msg); |
704 hk_message_out(bare_jid, p, 0, msg); |
698 |
705 |
699 // Network part |
706 // Network part |
700 jb_send_msg(jid, msg, ROSTER_TYPE_USER, NULL); |
707 jb_send_msg(jid, msg, ROSTER_TYPE_USER, NULL); |
701 g_free(jid); |
708 g_free(jid); |
702 if (p) g_free(bare_jid); |
709 if (p) g_free(bare_jid); |