From bc6e32175d703e5cf7b4ed7638ee7b60c521c298 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sat, 14 Mar 2015 14:50:45 +0000
Subject: Removed from argument from outgoing message functions

---
 src/command/command.c  |  8 ++++----
 src/command/commands.c | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/command')

diff --git a/src/command/command.c b/src/command/command.c
index 806a75f2..0bca4212 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -1960,7 +1960,7 @@ _cmd_execute_default(const char * inp)
                             jid_destroy(jidp);
                         }
 
-                        ui_outgoing_chat_msg("me", chatwin->barejid, inp, id);
+                        ui_outgoing_chat_msg(chatwin->barejid, inp, id);
                     } else {
                         cons_show_error("Failed to send message.");
                     }
@@ -1973,7 +1973,7 @@ _cmd_execute_default(const char * inp)
                         jid_destroy(jidp);
                     }
 
-                    ui_outgoing_chat_msg("me", chatwin->barejid, inp, id);
+                    ui_outgoing_chat_msg(chatwin->barejid, inp, id);
                 }
 #else
                 char *id = message_send_chat(chatwin->barejid, inp);
@@ -1984,7 +1984,7 @@ _cmd_execute_default(const char * inp)
                     jid_destroy(jidp);
                 }
 
-                ui_outgoing_chat_msg("me", chatwin->barejid, inp, id);
+                ui_outgoing_chat_msg(chatwin->barejid, inp, id);
 #endif
             }
             break;
@@ -1995,7 +1995,7 @@ _cmd_execute_default(const char * inp)
             } else {
                 ProfPrivateWin *privatewin = wins_get_current_private();
                 message_send_private(privatewin->fulljid, inp);
-                ui_outgoing_private_msg("me", privatewin->fulljid, inp);
+                ui_outgoing_private_msg(privatewin->fulljid, inp);
             }
             break;
 
diff --git a/src/command/commands.c b/src/command/commands.c
index 549a733d..8075e2c0 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -1240,7 +1240,7 @@ cmd_msg(gchar **args, struct cmd_help_t help)
 
             if (msg != NULL) {
                 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 {
                 ui_new_private_win(full_jid->str);
             }
@@ -1267,7 +1267,7 @@ cmd_msg(gchar **args, struct cmd_help_t help)
                 if (encrypted != NULL) {
                     char *id = message_send_chat_encrypted(barejid, 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)) {
                         const char *jid = jabber_get_fulljid();
@@ -1301,7 +1301,7 @@ cmd_msg(gchar **args, struct cmd_help_t help)
                 } else {
                     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)) {
                     const char *jid = jabber_get_fulljid();
@@ -1313,7 +1313,7 @@ cmd_msg(gchar **args, struct cmd_help_t help)
             return TRUE;
 #else
             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)) {
                 const char *jid = jabber_get_fulljid();
@@ -3089,7 +3089,7 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
                             jid_destroy(jidp);
                         }
 
-                        ui_outgoing_chat_msg("me", chatwin->barejid, tiny, id);
+                        ui_outgoing_chat_msg(chatwin->barejid, tiny, id);
                     } else {
                         cons_show_error("Failed to send message.");
                     }
@@ -3102,7 +3102,7 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
                         jid_destroy(jidp);
                     }
 
-                    ui_outgoing_chat_msg("me", chatwin->barejid, tiny, id);
+                    ui_outgoing_chat_msg(chatwin->barejid, tiny, id);
                 }
 #else
                 char *id = message_send_chat(chatwin->barejid, tiny);
@@ -3113,12 +3113,12 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
                     jid_destroy(jidp);
                 }
 
-                ui_outgoing_chat_msg("me", chatwin->barejid, tiny, id);
+                ui_outgoing_chat_msg(chatwin->barejid, tiny, id);
 #endif
             } else if (win_type == WIN_PRIVATE) {
                 ProfPrivateWin *privatewin = wins_get_current_private();
                 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) {
                 ProfMucWin *mucwin = wins_get_current_muc();
                 message_send_groupchat(mucwin->roomjid, tiny);
-- 
cgit 1.4.1-2-gfad0