diff options
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/core.c | 26 | ||||
-rw-r--r-- | src/ui/ui.h | 2 |
2 files changed, 8 insertions, 20 deletions
diff --git a/src/ui/core.c b/src/ui/core.c index a4ed45f3..40f9dbbf 100644 --- a/src/ui/core.c +++ b/src/ui/core.c @@ -1395,7 +1395,7 @@ ui_open_xmlconsole_win(void) } } -ProfWin* +ProfChatWin* ui_new_chat_win(const char * const barejid) { ProfWin *window = wins_new_chat(barejid); @@ -1421,7 +1421,7 @@ ui_new_chat_win(const char * const barejid) } } - return window; + return chatwin; } void @@ -1429,40 +1429,28 @@ ui_outgoing_chat_msg(const char * const barejid, const char * const message, cha { ProfWin *window = (ProfWin*)wins_get_chat(barejid); - // create new window - if (!window) { - window = ui_new_chat_win(barejid); - } - - ProfChatWin *chatwin = (ProfChatWin*)window; - chat_state_active(chatwin->state); - if (prefs_get_boolean(PREF_RECEIPTS_REQUEST) && id) { win_print_with_receipt(window, '-', NULL, 0, THEME_TEXT_ME, "me", message, id); } else { win_print(window, '-', NULL, 0, THEME_TEXT_ME, "me", message); } - - int num = wins_get_num(window); - ui_switch_win_num(num); } void ui_outgoing_chat_msg_carbon(const char * const barejid, const char * const message) { - ProfWin *window = (ProfWin*)wins_get_chat(barejid); + ProfChatWin *chatwin = wins_get_chat(barejid); // create new window - if (!window) { - window = ui_new_chat_win(barejid); + if (!chatwin) { + chatwin = ui_new_chat_win(barejid); } - ProfChatWin *chatwin = (ProfChatWin*)window; chat_state_active(chatwin->state); - win_print(window, '-', NULL, 0, THEME_TEXT_ME, "me", message); + win_print((ProfWin*)chatwin, '-', NULL, 0, THEME_TEXT_ME, "me", message); - int num = wins_get_num(window); + int num = wins_get_num((ProfWin*)chatwin); status_bar_active(num); } diff --git a/src/ui/ui.h b/src/ui/ui.h index d5e9c28c..11457988 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -88,7 +88,7 @@ void ui_handle_otr_error(const char * const barejid, const char * const message) unsigned long ui_get_idle_time(void); void ui_reset_idle_time(void); void ui_new_private_win(const char * const fulljid); -ProfWin* ui_new_chat_win(const char * const barejid); +ProfChatWin* ui_new_chat_win(const char * const barejid); void ui_print_system_msg_from_recipient(const char * const barejid, const char *message); gint ui_unread(void); void ui_close_connected_win(int index); |