aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Merge branch 'master' into pgp

Browse Source
This commit is contained in:
James Booth 2015-05-04 01:10:30 +01:00
commit 3dace733d9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/commands.c
View File

@ -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:

4
src/event/client_events.c
View File

@ -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

2
src/event/client_events.h
View File

@ -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