devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-20 07:06:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pgp

Browse Source
This commit is contained in:
James Booth
2015-05-04 01:34:18 +01:00
parent 3dace733d9 c8eaaa0ce9
commit aca102f542
8 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ui/core.c
View File

@@ -1273,14 +1273,11 @@ ui_recipient_gone(const char * const barejid, const char * const resource)
}
}
void
ProfPrivateWin*
ui_new_private_win(const char * const fulljid)
{
ProfWin *window = (ProfWin*)wins_get_private(fulljid);
if (!window) {
window = wins_new_private(fulljid);
}
ui_ev_focus_win(window);
ProfWin *window = wins_new_private(fulljid);
return (ProfPrivateWin*)window;
}
void
@@ -1357,15 +1354,9 @@ ui_outgoing_chat_msg_carbon(const char * const barejid, const char * const messa
}
void
ui_outgoing_private_msg(const char * const fulljid, const char * const message)
ui_outgoing_private_msg(ProfPrivateWin *privwin, const char * const message)
{
ProfWin *window = (ProfWin*)wins_get_private(fulljid);
if (!window) {
window = wins_new_private(fulljid);
}
win_print(window, '-', NULL, 0, THEME_TEXT_ME, "me", message);
ui_ev_focus_win(window);
win_print((ProfWin*)privwin, '-', NULL, 0, THEME_TEXT_ME, "me", message);
}
void

4
src/ui/ui.h
View File

@@ -84,7 +84,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);
ProfPrivateWin* ui_new_private_win(const char * const fulljid);
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);
@@ -122,7 +122,7 @@ void ui_recipient_gone(const char * const barejid, const char * const resource);
void ui_outgoing_chat_msg(ProfChatWin *chatwin, const char * const message, char *id);
void ui_outgoing_chat_msg_carbon(const char * const barejid, const char * const message);
void ui_outgoing_private_msg(const char * const fulljid, const char * const message);
void ui_outgoing_private_msg(ProfPrivateWin *privwin, const char * const message);
void ui_room_join(const char * const roomjid, gboolean focus);
void ui_switch_to_room(const char * const roomjid);