diff options
| author | James Booth <boothj5@gmail.com> | 2015-05-04 01:10:30 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-05-04 01:10:30 +0100 |
| commit | 3dace733d982fdb33670f9a919cd9f46661d7088 (patch) | |
| tree | ab9ca2073a03035425a87d103b545f15c555b110 /src | |
| parent | bb2b5d20d5cf34e5644b9f04889e0e90e06aeb8a (diff) | |
| parent | b1dd1e2726892ac8152ba4b8f880f693c113a6e9 (diff) | |
| download | profani-tty-3dace733d982fdb33670f9a919cd9f46661d7088.tar.gz | |
Merge branch 'master' into pgp
Diffstat (limited to 'src')
| -rw-r--r-- | src/command/commands.c | 4 | ||||
| -rw-r--r-- | src/event/client_events.c | 4 | ||||
| -rw-r--r-- | src/event/client_events.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/command/commands.c b/src/command/commands.c index f3a247e8..4c868d77 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -125,7 +125,7 @@ cmd_execute_default(const char * inp) case WIN_MUC: { ProfMucWin *mucwin = wins_get_current_muc(); - cl_ev_send_muc_msg(mucwin->roomjid, inp); + cl_ev_send_muc_msg(mucwin, inp); break; } default: @@ -3166,7 +3166,7 @@ cmd_tiny(gchar **args, struct cmd_help_t help) case WIN_MUC: { ProfMucWin *mucwin = wins_get_current_muc(); - cl_ev_send_muc_msg(mucwin->roomjid, tiny); + cl_ev_send_muc_msg(mucwin, tiny); break; } default: diff --git a/src/event/client_events.c b/src/event/client_events.c index 9f1acca4..167dfac7 100644 --- a/src/event/client_events.c +++ b/src/event/client_events.c @@ -76,9 +76,9 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg) } void -cl_ev_send_muc_msg(const char * const roomjid, const char * const msg) +cl_ev_send_muc_msg(ProfMucWin *mucwin, const char * const msg) { - message_send_groupchat(roomjid, msg); + message_send_groupchat(mucwin->roomjid, msg); } void diff --git a/src/event/client_events.h b/src/event/client_events.h index c074b230..3685cb2d 100644 --- a/src/event/client_events.h +++ b/src/event/client_events.h @@ -39,7 +39,7 @@ jabber_conn_status_t cl_ev_connect_jid(const char * const jid, const char * cons jabber_conn_status_t cl_ev_connect_account(ProfAccount *account); void cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg); -void cl_ev_send_muc_msg(const char * const roomjid, const char * const msg); +void cl_ev_send_muc_msg(ProfMucWin *mucwin, const char * const msg); void cl_ev_send_priv_msg(const char * const fulljid, const char * const msg); #endif \ No newline at end of file |