about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-04-29 21:55:09 +0100
committerJames Booth <boothj5@gmail.com>2015-04-29 21:55:09 +0100
commit8de308c96af476de607d7ba5ecee5dc7c990ffc5 (patch)
tree5ffc1131dfbee3fdfdd435416b79922ef60a2078 /src
parent15b34692fdd7cd6c2d377bc0daa2b8002cc318f3 (diff)
downloadprofani-tty-8de308c96af476de607d7ba5ecee5dc7c990ffc5.tar.gz
Changed message when sending non encrypted message with OTR policy always
Diffstat (limited to 'src')
-rw-r--r--src/otr/otr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/otr/otr.c b/src/otr/otr.c
index c8518c70..7507cd56 100644
--- a/src/otr/otr.c
+++ b/src/otr/otr.c
@@ -322,7 +322,7 @@ otr_on_message_send(const char * const barejid, const char * const message)
 
     if (otr_is_secure(barejid)) {
         char *encrypted = otr_encrypt_message(barejid, message);
-        if (encrypted != NULL) {
+        if (encrypted) {
             id = message_send_chat_encrypted(barejid, encrypted);
             chat_log_otr_msg_out(barejid, message);
             ui_outgoing_chat_msg(barejid, message, id);
@@ -332,7 +332,7 @@ otr_on_message_send(const char * const barejid, const char * const message)
         }
 
     } else if (policy == PROF_OTRPOLICY_ALWAYS) {
-        cons_show_error("Failed to send message. Please check OTR policy");
+        cons_show_error("Failed to send message. OTR policy set to: always");
 
     } else if (policy == PROF_OTRPOLICY_OPPORTUNISTIC) {
         char *otr_tagged_msg = otr_tag_message(message);
* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
idle
  90/nop/xchg-eax-eax
copy
  mov r/m32 r32: 89
  mov r32 r/m32: 8b
  mov r/m32 imm32: c7
  memcpy
  $copy_and_increment_refcounts destination, source, [type descriptor]

add
subtract
multiply
divide
divide-with-remainder
square-root
shift-right
shift-left
not
flip-bits
or
or-bits
and
and-bits
xor-bits
equal
not-equal
lesser-than
lesser-or-equal
greater-than
greater-or-equal
round
truncate
max
min
random
jump
jump-if
jump-unless
call (dynamic)
return
next-ingredient
ingredient
rewind-ingredients
character-to-code
new _, _
length
index
put-index
new _
get
put
maybe-convert
trace
to-text
deep-copy
hash
wait-for-reset-then-set
reset
get-location
wait-for-routine
switch
current-routine-is-blocked
current-routine-is-unblocked
wait-for-routine-to-block
restart
limit-time