aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-09-29 19:56:07 -04:00
Code

Removed from argument from outgoing message functions

Browse Source
This commit is contained in:
James Booth 2015-03-14 14:50:45 +00:00
parent 6fd5b617ef
commit bc6e32175d
6 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/command/command.c
View File

@ -1960,7 +1960,7 @@ _cmd_execute_default(const char * inp)
jid_destroy(jidp); jid_destroy(jidp);
} }
ui_outgoing_chat_msg("me", chatwin->barejid, inp, id); ui_outgoing_chat_msg(chatwin->barejid, inp, id);
} else { } else {
cons_show_error("Failed to send message."); cons_show_error("Failed to send message.");
} }
@ -1973,7 +1973,7 @@ _cmd_execute_default(const char * inp)
jid_destroy(jidp); jid_destroy(jidp);
} }
ui_outgoing_chat_msg("me", chatwin->barejid, inp, id); ui_outgoing_chat_msg(chatwin->barejid, inp, id);
} }
#else #else
char *id = message_send_chat(chatwin->barejid, inp); char *id = message_send_chat(chatwin->barejid, inp);
@ -1984,7 +1984,7 @@ _cmd_execute_default(const char * inp)
jid_destroy(jidp); jid_destroy(jidp);
} }
ui_outgoing_chat_msg("me", chatwin->barejid, inp, id); ui_outgoing_chat_msg(chatwin->barejid, inp, id);
#endif #endif
} }
break; break;
@ -1995,7 +1995,7 @@ _cmd_execute_default(const char * inp)
} else { } else {
ProfPrivateWin *privatewin = wins_get_current_private(); ProfPrivateWin *privatewin = wins_get_current_private();
message_send_private(privatewin->fulljid, inp); message_send_private(privatewin->fulljid, inp);
ui_outgoing_private_msg("me", privatewin->fulljid, inp); ui_outgoing_private_msg(privatewin->fulljid, inp);
} }
break; break;

16
src/command/commands.c
View File

@ -1240,7 +1240,7 @@ cmd_msg(gchar **args, struct cmd_help_t help)
if (msg != NULL) { if (msg != NULL) {
message_send_private(full_jid->str, msg); message_send_private(full_jid->str, msg);
ui_outgoing_private_msg("me", full_jid->str, msg); ui_outgoing_private_msg(full_jid->str, msg);
} else { } else {
ui_new_private_win(full_jid->str); ui_new_private_win(full_jid->str);
} }
@ -1267,7 +1267,7 @@ cmd_msg(gchar **args, struct cmd_help_t help)
if (encrypted != NULL) { if (encrypted != NULL) {
char *id = message_send_chat_encrypted(barejid, encrypted); char *id = message_send_chat_encrypted(barejid, encrypted);
otr_free_message(encrypted); otr_free_message(encrypted);
ui_outgoing_chat_msg("me", barejid, msg, id); ui_outgoing_chat_msg(barejid, msg, id);
if (((win_type == WIN_CHAT) || (win_type == WIN_CONSOLE)) && prefs_get_boolean(PREF_CHLOG)) { if (((win_type == WIN_CHAT) || (win_type == WIN_CONSOLE)) && prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = jabber_get_fulljid();
@ -1301,7 +1301,7 @@ cmd_msg(gchar **args, struct cmd_help_t help)
} else { } else {
id = message_send_chat(barejid, msg); id = message_send_chat(barejid, msg);
} }
ui_outgoing_chat_msg("me", barejid, msg, id); ui_outgoing_chat_msg(barejid, msg, id);
if (((win_type == WIN_CHAT) || (win_type == WIN_CONSOLE)) && prefs_get_boolean(PREF_CHLOG)) { if (((win_type == WIN_CHAT) || (win_type == WIN_CONSOLE)) && prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = jabber_get_fulljid();
@ -1313,7 +1313,7 @@ cmd_msg(gchar **args, struct cmd_help_t help)
return TRUE; return TRUE;
#else #else
char *id = message_send_chat(barejid, msg); char *id = message_send_chat(barejid, msg);
ui_outgoing_chat_msg("me", barejid, msg, id); ui_outgoing_chat_msg(barejid, msg, id);
if (((win_type == WIN_CHAT) || (win_type == WIN_CONSOLE)) && prefs_get_boolean(PREF_CHLOG)) { if (((win_type == WIN_CHAT) || (win_type == WIN_CONSOLE)) && prefs_get_boolean(PREF_CHLOG)) {
const char *jid = jabber_get_fulljid(); const char *jid = jabber_get_fulljid();
@ -3089,7 +3089,7 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
jid_destroy(jidp); jid_destroy(jidp);
} }
ui_outgoing_chat_msg("me", chatwin->barejid, tiny, id); ui_outgoing_chat_msg(chatwin->barejid, tiny, id);
} else { } else {
cons_show_error("Failed to send message."); cons_show_error("Failed to send message.");
} }
@ -3102,7 +3102,7 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
jid_destroy(jidp); jid_destroy(jidp);
} }
ui_outgoing_chat_msg("me", chatwin->barejid, tiny, id); ui_outgoing_chat_msg(chatwin->barejid, tiny, id);
} }
#else #else
char *id = message_send_chat(chatwin->barejid, tiny); char *id = message_send_chat(chatwin->barejid, tiny);
@ -3113,12 +3113,12 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
jid_destroy(jidp); jid_destroy(jidp);
} }
ui_outgoing_chat_msg("me", chatwin->barejid, tiny, id); ui_outgoing_chat_msg(chatwin->barejid, tiny, id);
#endif #endif
} else if (win_type == WIN_PRIVATE) { } else if (win_type == WIN_PRIVATE) {
ProfPrivateWin *privatewin = wins_get_current_private(); ProfPrivateWin *privatewin = wins_get_current_private();
message_send_private(privatewin->fulljid, tiny); message_send_private(privatewin->fulljid, tiny);
ui_outgoing_private_msg("me", privatewin->fulljid, tiny); ui_outgoing_private_msg(privatewin->fulljid, tiny);
} else if (win_type == WIN_MUC) { } else if (win_type == WIN_MUC) {
ProfMucWin *mucwin = wins_get_current_muc(); ProfMucWin *mucwin = wins_get_current_muc();
message_send_groupchat(mucwin->roomjid, tiny); message_send_groupchat(mucwin->roomjid, tiny);

2
src/server_events.c
View File

@ -310,7 +310,7 @@ handle_incoming_private_message(char *fulljid, char *message)
void void
handle_carbon(char *barejid, char *message){ handle_carbon(char *barejid, char *message){
ui_outgoing_chat_msg("me", barejid, message, NULL); ui_outgoing_chat_msg(barejid, message, NULL);
} }
void void

12
src/ui/core.c
View File

@ -1423,8 +1423,7 @@ ui_open_xmlconsole_win(void)
} }
void void
ui_outgoing_chat_msg(const char * const from, const char * const barejid, ui_outgoing_chat_msg(const char * const barejid, const char * const message, char *id)
const char * const message, char *id)
{ {
PContact contact = roster_get_contact(barejid); PContact contact = roster_get_contact(barejid);
ProfWin *window = (ProfWin*)wins_get_chat(barejid); ProfWin *window = (ProfWin*)wins_get_chat(barejid);
@ -1464,18 +1463,17 @@ ui_outgoing_chat_msg(const char * const from, const char * const barejid,
GString *message_with_id = g_string_new(id); GString *message_with_id = g_string_new(id);
g_string_append(message_with_id, ": "); g_string_append(message_with_id, ": ");
g_string_append(message_with_id, message); g_string_append(message_with_id, message);
win_print(window, '-', NULL, 0, THEME_TEXT_ME, from, message_with_id->str); win_print(window, '-', NULL, 0, THEME_TEXT_ME, "me", message_with_id->str);
g_string_free(message_with_id, TRUE); g_string_free(message_with_id, TRUE);
free(id); free(id);
} else { } else {
win_print(window, '-', NULL, 0, THEME_TEXT_ME, from, message); win_print(window, '-', NULL, 0, THEME_TEXT_ME, "me", message);
} }
ui_switch_win(num); ui_switch_win(num);
} }
void void
ui_outgoing_private_msg(const char * const from, const char * const fulljid, ui_outgoing_private_msg(const char * const fulljid, const char * const message)
const char * const message)
{ {
ProfWin *window = (ProfWin*)wins_get_private(fulljid); ProfWin *window = (ProfWin*)wins_get_private(fulljid);
int num = 0; int num = 0;
@ -1490,7 +1488,7 @@ ui_outgoing_private_msg(const char * const from, const char * const fulljid,
num = wins_get_num(window); num = wins_get_num(window);
} }
win_print(window, '-', NULL, 0, THEME_TEXT_ME, from, message); win_print(window, '-', NULL, 0, THEME_TEXT_ME, "me", message);
ui_switch_win(num); ui_switch_win(num);
} }

6
src/ui/ui.h
View File

@ -121,10 +121,8 @@ void ui_message_receipt(const char * const barejid, const char * const id);
void ui_disconnected(void); void ui_disconnected(void);
void ui_recipient_gone(const char * const barejid, const char * const resource); void ui_recipient_gone(const char * const barejid, const char * const resource);
void ui_outgoing_chat_msg(const char * const from, const char * const barejid, void ui_outgoing_chat_msg(const char * const barejid, const char * const message, char *id);
const char * const message, char *id); void ui_outgoing_private_msg(const char * const fulljid, const char * const message);
void ui_outgoing_private_msg(const char * const from, const char * const fulljid,
const char * const message);
void ui_room_join(const char * const roomjid, gboolean focus); void ui_room_join(const char * const roomjid, gboolean focus);
void ui_switch_to_room(const char * const roomjid); void ui_switch_to_room(const char * const roomjid);

6
tests/ui/stub_ui.c
View File

@ -201,10 +201,8 @@ void ui_incoming_private_msg(const char * const fulljid, const char * const mess
void ui_disconnected(void) {} void ui_disconnected(void) {}
void ui_recipient_gone(const char * const barejid, const char * const resource) {} void ui_recipient_gone(const char * const barejid, const char * const resource) {}
void ui_outgoing_chat_msg(const char * const from, const char * const barejid, void ui_outgoing_chat_msg(const char * const barejid, const char * const message, char *id) {}
const char * const message, char *id) {} void ui_outgoing_private_msg(const char * const fulljid, const char * const message) {}
void ui_outgoing_private_msg(const char * const from, const char * const fulljid,
const char * const message) {}
void ui_room_join(const char * const roomjid, gboolean focus) {} void ui_room_join(const char * const roomjid, gboolean focus) {}
void ui_switch_to_room(const char * const roomjid) {} void ui_switch_to_room(const char * const roomjid) {}