Display special char for encrypted messages

2 files changed, 25 insertions, 17 deletions

diff --git a/src/event/client_events.c b/src/event/client_events.c
index 2bf48234..f8df6bf4 100644
--- a/src/event/client_events.c
+++ b/src/event/client_events.c
@@ -97,13 +97,13 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg)
         if (!handled) {
             char *id = message_send_chat(chatwin->barejid, msg);
             chat_log_msg_out(chatwin->barejid, msg);
-            ui_outgoing_chat_msg(chatwin, msg, id);
+            ui_outgoing_chat_msg(chatwin, msg, id, PROF_ENC_NONE);
             free(id);
         }
     } else { // enc_mode = PROF_ENC_PGP
         char *id = message_send_chat_pgp(chatwin->barejid, msg);
         chat_log_pgp_msg_out(chatwin->barejid, msg);
-        ui_outgoing_chat_msg(chatwin, msg, id);
+        ui_outgoing_chat_msg(chatwin, msg, id, PROF_ENC_PGP);
         free(id);
     }
     return;
@@ -117,7 +117,7 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg)
     if (!handled) {
         char *id = message_send_chat(chatwin->barejid, msg);
         chat_log_msg_out(chatwin->barejid, msg);
-        ui_outgoing_chat_msg(chatwin, msg, id);
+        ui_outgoing_chat_msg(chatwin, msg, id, PROF_ENC_NONE);
         free(id);
     }
     return;
@@ -131,12 +131,12 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg)
     if (enc_mode == PROF_ENC_NONE) {
         char *id = message_send_chat(chatwin->barejid, msg);
         chat_log_msg_out(chatwin->barejid, msg);
-        ui_outgoing_chat_msg(chatwin, msg, id);
+        ui_outgoing_chat_msg(chatwin, msg, id, PROF_ENC_NONE);
         free(id);
     } else if (enc_mode == PROF_ENC_PGP) {
         char *id = message_send_chat_pgp(chatwin->barejid, msg);
         chat_log_pgp_msg_out(chatwin->barejid, msg);
-        ui_outgoing_chat_msg(chatwin, msg, id);
+        ui_outgoing_chat_msg(chatwin, msg, id, PROF_ENC_PGP);
         free(id);
     }
     return;
@@ -148,7 +148,7 @@ cl_ev_send_msg(ProfChatWin *chatwin, const char * const msg)
 #ifndef HAVE_LIBGPGME
     char *id = message_send_chat(chatwin->barejid, msg);
     chat_log_msg_out(chatwin->barejid, msg);
-    ui_outgoing_chat_msg(chatwin, msg, id);
+    ui_outgoing_chat_msg(chatwin, msg, id, PROF_ENC_NONE;
     free(id);
     return;
 #endif
diff --git a/src/event/server_events.c b/src/event/server_events.c
index 0755aae5..283fc264 100644
--- a/src/event/server_events.c
+++ b/src/event/server_events.c
@@ -187,7 +187,7 @@ sv_ev_incoming_carbon(char *barejid, char *resource, char *message)
         new_win = TRUE;
     }
 
-    ui_incoming_msg(chatwin, resource, message, NULL, new_win);
+    ui_incoming_msg(chatwin, resource, message, NULL, new_win, PROF_ENC_NONE);
     chat_log_msg_in(barejid, message);
 }
 
@@ -215,12 +215,12 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *enc_m
                 if (enc_mode == PROF_ENC_NONE) {
                     win_println((ProfWin*)chatwin, 0, "PGP encryption enabled.");
                 }
-                ui_incoming_msg(chatwin, resource, decrypted, NULL, new_win);
+                ui_incoming_msg(chatwin, resource, decrypted, NULL, new_win, PROF_ENC_PGP);
                 chat_log_pgp_msg_in(barejid, decrypted);
                 chatwin->enc_mode = PROF_ENC_PGP;
                 p_gpg_free_decrypted(decrypted);
             } else {
-                ui_incoming_msg(chatwin, resource, message, NULL, new_win);
+                ui_incoming_msg(chatwin, resource, message, NULL, new_win, PROF_ENC_NONE);
                 chat_log_msg_in(barejid, message);
                 chatwin->enc_mode = PROF_ENC_NONE;
             }
@@ -228,14 +228,18 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *enc_m
     } else {
         if (enc_mode == PROF_ENC_PGP) {
             win_println((ProfWin*)chatwin, 0, "PGP encryption disabled.");
-            ui_incoming_msg(chatwin, resource, message, NULL, new_win);
+            ui_incoming_msg(chatwin, resource, message, NULL, new_win, PROF_ENC_NONE);
             chat_log_msg_in(barejid, message);
             chatwin->enc_mode = PROF_ENC_NONE;
         } else {
             gboolean decrypted = FALSE;
             char *otr_res = otr_on_message_recv(barejid, resource, message, &decrypted);
             if (otr_res) {
-                ui_incoming_msg(chatwin, resource, otr_res, NULL, new_win);
+                if (decrypted && g_strrstr(message, otr_res) == NULL) {
+                    ui_incoming_msg(chatwin, resource, otr_res, NULL, new_win, PROF_ENC_OTR);
+                } else {
+                    ui_incoming_msg(chatwin, resource, otr_res, NULL, new_win, PROF_ENC_NONE);
+                }
                 chat_log_otr_msg_in(barejid, otr_res, decrypted);
                 otr_free_message(otr_res);
             }
@@ -251,7 +255,11 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *enc_m
     gboolean decrypted = FALSE;
     char *otr_res = otr_on_message_recv(barejid, resource, message, &decrypted);
     if (otr_res) {
-        ui_incoming_msg(chatwin, resource, otr_res, NULL, new_win);
+        if (decrypted && g_strrstr(message, otr_res) == NULL) {
+            ui_incoming_msg(chatwin, resource, otr_res, NULL, new_win, PROF_ENC_OTR);
+        } else {
+            ui_incoming_msg(chatwin, resource, otr_res, NULL, new_win, PROF_ENC_NONE);
+        }
         chat_log_otr_msg_in(barejid, otr_res, decrypted);
         otr_free_message(otr_res);
     }
@@ -265,17 +273,17 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *enc_m
     if (enc_message) {
         char *decrypted = p_gpg_decrypt(enc_message);
         if (decrypted) {
-            ui_incoming_msg(chatwin, resource, decrypted, NULL, new_win);
+            ui_incoming_msg(chatwin, resource, decrypted, NULL, new_win, PROF_ENC_PGP);
             chat_log_pgp_msg_in(barejid, decrypted);
             chatwin->enc_mode = PROF_ENC_PGP;
             p_gpg_free_decrypted(decrypted);
         } else {
-            ui_incoming_msg(chatwin, resource, message, NULL, new_win);
+            ui_incoming_msg(chatwin, resource, message, NULL, new_win, PROF_ENC_NONE);
             chat_log_msg_in(barejid, message);
             chatwin->enc_mode = PROF_ENC_NONE;
         }
     } else {
-        ui_incoming_msg(chatwin, resource, message, NULL, new_win);
+        ui_incoming_msg(chatwin, resource, message, NULL, new_win, PROF_ENC_NONE);
         chat_log_msg_in(barejid, message);
         chatwin->enc_mode = PROF_ENC_NONE;
     }
@@ -286,7 +294,7 @@ sv_ev_incoming_message(char *barejid, char *resource, char *message, char *enc_m
 // OTR unsupported, PGP unsupported
 #ifndef HAVE_LIBOTR
 #ifndef HAVE_LIBGPGME
-    ui_incoming_msg(chatwin, resource, message, NULL, new_win);
+    ui_incoming_msg(chatwin, resource, message, NULL, new_win, PROF_ENC_NONE);
     chat_log_msg_in(barejid, message);
     chatwin->enc_mode = PROF_ENC_NONE;
     return;
@@ -311,7 +319,7 @@ sv_ev_delayed_message(char *barejid, char *message, GDateTime *timestamp)
         new_win = TRUE;
     }
 
-    ui_incoming_msg(chatwin, NULL, message, timestamp, new_win);
+    ui_incoming_msg(chatwin, NULL, message, timestamp, new_win, PROF_ENC_NONE);
     chat_log_msg_in_delayed(barejid, message, timestamp);
 }