devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

Renamed event functions

Browse Source
This commit is contained in:
James Booth
2015-04-28 23:38:56 +01:00
parent 403e9b47fe
commit 8aba52f4fe
11 changed files with 251 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/command/commands.c
View File

@@ -109,19 +109,19 @@ cmd_execute_default(const char * inp)
case WIN_CHAT:
{
ProfChatWin *chatwin = wins_get_current_chat();
client_send_msg(chatwin->barejid, inp);
cl_ev_send_msg(chatwin->barejid, inp);
break;
}
case WIN_PRIVATE:
{
ProfPrivateWin *privatewin = wins_get_current_private();
client_send_priv_msg(privatewin->fulljid, inp);
cl_ev_send_priv_msg(privatewin->fulljid, inp);
break;
}
case WIN_MUC:
{
ProfMucWin *mucwin = wins_get_current_muc();
client_send_muc_msg(mucwin->roomjid, inp);
cl_ev_send_muc_msg(mucwin->roomjid, inp);
break;
}
default:
@@ -208,13 +208,13 @@ cmd_connect(gchar **args, struct cmd_help_t help)
if (account) {
// use password if set
if (account->password) {
conn_status = client_connect_account(account);
conn_status = cl_ev_connect_account(account);
// use eval_password if set
} else if (account->eval_password) {
gboolean res = account_eval_password(account);
if (res) {
conn_status = client_connect_account(account);
conn_status = cl_ev_connect_account(account);
free(account->password);
account->password = NULL;
} else {
@@ -226,7 +226,7 @@ cmd_connect(gchar **args, struct cmd_help_t help)
// no account password setting, prompt
} else {
account->password = ui_ask_password();
conn_status = client_connect_account(account);
conn_status = cl_ev_connect_account(account);
free(account->password);
account->password = NULL;
}
@@ -237,7 +237,7 @@ cmd_connect(gchar **args, struct cmd_help_t help)
} else {
jid = strdup(lower);
char *passwd = ui_ask_password();
conn_status = client_connect_jid(jid, passwd, altdomain, port);
conn_status = cl_ev_connect_jid(jid, passwd, altdomain, port);
free(passwd);
}
@@ -1306,7 +1306,7 @@ cmd_msg(gchar **args, struct cmd_help_t help)
g_string_append(full_jid, usr);
if (msg) {
client_send_priv_msg(full_jid->str, msg);
cl_ev_send_priv_msg(full_jid->str, msg);
} else {
ui_new_private_win(full_jid->str);
}
@@ -1327,14 +1327,14 @@ cmd_msg(gchar **args, struct cmd_help_t help)
}
if (msg) {
client_send_msg(barejid, msg);
cl_ev_send_msg(barejid, msg);
return TRUE;
} else {
ProfWin *window = (ProfWin*)wins_get_chat(barejid);
if (window) {
client_focus_win(window);
ui_ev_focus_win(window);
} else {
client_new_chat_win(barejid);
ui_ev_new_chat_win(barejid);
}
#ifdef HAVE_LIBOTR
@@ -3141,19 +3141,19 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
case WIN_CHAT:
{
ProfChatWin *chatwin = wins_get_current_chat();
client_send_msg(chatwin->barejid, tiny);
cl_ev_send_msg(chatwin->barejid, tiny);
break;
}
case WIN_PRIVATE:
{
ProfPrivateWin *privatewin = wins_get_current_private();
client_send_priv_msg(privatewin->fulljid, tiny);
cl_ev_send_priv_msg(privatewin->fulljid, tiny);
break;
}
case WIN_MUC:
{
ProfMucWin *mucwin = wins_get_current_muc();
client_send_muc_msg(mucwin->roomjid, tiny);
cl_ev_send_muc_msg(mucwin->roomjid, tiny);
break;
}
default:
@@ -4171,9 +4171,9 @@ cmd_otr(gchar **args, struct cmd_help_t help)
ProfWin *window = (ProfWin*)wins_get_chat(barejid);
if (window) {
client_focus_win(window);
ui_ev_focus_win(window);
} else {
client_new_chat_win(barejid);
ui_ev_new_chat_win(barejid);
}
if (ui_current_win_is_otr()) {