diff options
author | James Booth <boothj5@gmail.com> | 2015-11-08 22:01:51 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-11-08 22:01:51 +0000 |
commit | 8a397263ddab0762f7ce7f0ce19a2eb19c54b48a (patch) | |
tree | ce2c251f380ff2be82e83f5495b16559926a4182 /src/ui | |
parent | ebff1fc81e84685a3e7cd51000d106fb99d3e45d (diff) | |
download | profani-tty-8a397263ddab0762f7ce7f0ce19a2eb19c54b48a.tar.gz |
ui_incoming_private_msg takes ProfPrivateWin, added asserts
Diffstat (limited to 'src/ui')
-rw-r--r-- | src/ui/privwin.c | 13 | ||||
-rw-r--r-- | src/ui/ui.h | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/ui/privwin.c b/src/ui/privwin.c index 487492b9..5b896d85 100644 --- a/src/ui/privwin.c +++ b/src/ui/privwin.c @@ -32,6 +32,7 @@ * */ +#include <assert.h> #include <glib.h> #include "ui/win_types.h" @@ -41,18 +42,14 @@ #include "config/preferences.h" void -ui_incoming_private_msg(const char *const fulljid, const char *const message, GDateTime *timestamp) +ui_incoming_private_msg(ProfPrivateWin *privatewin, const char *const message, GDateTime *timestamp) { - ProfPrivateWin *privatewin = wins_get_private(fulljid); - if (privatewin == NULL) { - ProfWin *window = wins_new_private(fulljid); - privatewin = (ProfPrivateWin*)window; - } + assert(privatewin != NULL); ProfWin *window = (ProfWin*) privatewin; int num = wins_get_num(window); - char *display_from = get_nick_from_full_jid(fulljid); + char *display_from = get_nick_from_full_jid(privatewin->fulljid); // currently viewing chat window with sender if (wins_is_current(window)) { @@ -86,5 +83,7 @@ ui_incoming_private_msg(const char *const fulljid, const char *const message, GD void ui_outgoing_private_msg(ProfPrivateWin *privwin, const char *const message) { + assert(privwin != NULL); + win_print((ProfWin*)privwin, '-', 0, NULL, 0, THEME_TEXT_ME, "me", message); } diff --git a/src/ui/ui.h b/src/ui/ui.h index 751e65ca..5fba3982 100644 --- a/src/ui/ui.h +++ b/src/ui/ui.h @@ -83,7 +83,7 @@ char* ui_get_line(void); char* ui_ask_pgp_passphrase(const char *hint, int prev_fail); void ui_contact_online(char *barejid, Resource *resource, GDateTime *last_activity); void ui_contact_typing(const char *const barejid, const char *const resource); -void ui_incoming_private_msg(const char *const fulljid, const char *const message, GDateTime *timestamp); +void ui_incoming_private_msg(ProfPrivateWin *privatewin, const char *const message, GDateTime *timestamp); void ui_disconnected(void); void ui_outgoing_private_msg(ProfPrivateWin *privwin, const char *const message); void ui_room_join(const char *const roomjid, gboolean focus); |