diff options
| author | James Booth <boothj5@gmail.com> | 2015-01-04 23:40:10 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-01-04 23:40:10 +0000 |
| commit | 8326c8b3a21fd4a6aa415f92584aebedd51b01d9 (patch) | |
| tree | 74c4477596daed645d9af2bbb3223f9c42ca2aca /src/command/command.c | |
| parent | 42a5c431c777ab22c2187bb6f50a62ef304d8d6b (diff) | |
| download | profani-tty-8326c8b3a21fd4a6aa415f92584aebedd51b01d9.tar.gz | |
Refactored chat session handling on sending message
Diffstat (limited to 'src/command/command.c')
| -rw-r--r-- | src/command/command.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/src/command/command.c b/src/command/command.c index 470bb886..7fd1616e 100644 --- a/src/command/command.c +++ b/src/command/command.c @@ -1814,15 +1814,7 @@ cmd_execute_default(const char * inp) if (otr_is_secure(chatwin->barejid)) { char *encrypted = otr_encrypt_message(chatwin->barejid, inp); if (encrypted != NULL) { - char *resource = NULL; - gboolean send_state = FALSE; - if (chat_session_exists(chatwin->barejid)) { - resource = chat_session_get_resource(chatwin->barejid); - send_state = chat_session_on_message_send(chatwin->barejid); - } else { - send_state = TRUE; - } - message_send_chat(chatwin->barejid, resource, encrypted, send_state); + message_send_chat(chatwin->barejid, encrypted); otr_free_message(encrypted); if (prefs_get_boolean(PREF_CHLOG)) { const char *jid = jabber_get_fulljid(); @@ -1842,15 +1834,7 @@ cmd_execute_default(const char * inp) cons_show_error("Failed to send message."); } } else { - char *resource = NULL; - gboolean send_state = FALSE; - if (chat_session_exists(chatwin->barejid)) { - resource = chat_session_get_resource(chatwin->barejid); - send_state = chat_session_on_message_send(chatwin->barejid); - } else { - send_state = TRUE; - } - message_send_chat(chatwin->barejid, resource, inp, send_state); + message_send_chat(chatwin->barejid, inp); if (prefs_get_boolean(PREF_CHLOG)) { const char *jid = jabber_get_fulljid(); Jid *jidp = jid_create(jid); @@ -1861,15 +1845,7 @@ cmd_execute_default(const char * inp) ui_outgoing_chat_msg("me", chatwin->barejid, inp); } #else - char *resource = NULL; - gboolean send_state = FALSE; - if (chat_session_exists(chatwin->barejid)) { - resource = chat_session_get_resource(chatwin->barejid); - send_state = chat_session_on_message_send(chatwin->barejid); - } else { - send_state = TRUE; - } - message_send_chat(chatwin->barejid, resource, inp, send_state); + message_send_chat(chatwin->barejid, inp); if (prefs_get_boolean(PREF_CHLOG)) { const char *jid = jabber_get_fulljid(); Jid *jidp = jid_create(jid); |