devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-18 15:36:21 +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

14
src/command/commands.c
View File

@@ -119,7 +119,7 @@ cmd_execute_default(const char * inp)
case WIN_PRIVATE:
{
ProfPrivateWin *privatewin = wins_get_current_private();
cl_ev_send_priv_msg(privatewin->fulljid, inp);
cl_ev_send_priv_msg(privatewin, inp);
break;
}
case WIN_MUC:
@@ -1321,10 +1321,14 @@ cmd_msg(gchar **args, struct cmd_help_t help)
g_string_append(full_jid, "/");
g_string_append(full_jid, usr);
ProfPrivateWin *privwin = wins_get_private(full_jid->str);
if (!privwin) {
privwin = ui_ev_new_private_win(full_jid->str);
}
ui_ev_focus_win((ProfWin*)privwin);
if (msg) {
cl_ev_send_priv_msg(full_jid->str, msg);
} else {
ui_new_private_win(full_jid->str);
cl_ev_send_priv_msg(privwin, msg);
}
g_string_free(full_jid, TRUE);
@@ -3160,7 +3164,7 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
case WIN_PRIVATE:
{
ProfPrivateWin *privatewin = wins_get_current_private();
cl_ev_send_priv_msg(privatewin->fulljid, tiny);
cl_ev_send_priv_msg(privatewin, tiny);
break;
}
case WIN_MUC: