mirror of
https://github.com/profanity-im/profanity.git
synced 2025-02-02 15:08:15 -05:00
Merge branch 'master' into pgp
This commit is contained in:
commit
3dace733d9
@ -125,7 +125,7 @@ cmd_execute_default(const char * inp)
|
|||||||
case WIN_MUC:
|
case WIN_MUC:
|
||||||
{
|
{
|
||||||
ProfMucWin *mucwin = wins_get_current_muc();
|
ProfMucWin *mucwin = wins_get_current_muc();
|
||||||
cl_ev_send_muc_msg(mucwin->roomjid, inp);
|
cl_ev_send_muc_msg(mucwin, inp);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
@ -3166,7 +3166,7 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
|
|||||||
case WIN_MUC:
|
case WIN_MUC:
|
||||||
{
|
{
|
||||||
ProfMucWin *mucwin = wins_get_current_muc();
|
ProfMucWin *mucwin = wins_get_current_muc();
|
||||||
cl_ev_send_muc_msg(mucwin->roomjid, tiny);
|
cl_ev_send_muc_msg(mucwin, tiny);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
@ -76,9 +76,9 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
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
|
void
|
||||||
|
@ -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);
|
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_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);
|
void cl_ev_send_priv_msg(const char * const fulljid, const char * const msg);
|
||||||
|
|
||||||
#endif
|
#endif
|
Loading…
Reference in New Issue
Block a user