fix(chatwin): only fire plugins_post_chat_message_display on incoming

The trigger was wired into outgoing / outgoing-carbon / history paths
too, which made plugins like sounds.py play the "new message" sound
when opening a chat (history loads), sending a message yourself, or
receiving a carbon of your own sent message from another device.

Restrict the call to chatwin_incoming_msg — matches the semantic of
"a remote party sent a chat message and it was displayed".

src/command/cmd_defs.c

@@ -2638,7 +2638,8 @@ static const struct cmd_t command_defs[] = {
       CMD_DESC(
               "Spawn external editor to edit message. "
               "After editing the inputline may appear empty. Press enter to send the text anyways. "
-              "Use /executable to set your favourite editor." )
+              "Use /executable to set your favourite editor. "
+              "Ctrl-Z in the editor aborts the session and returns to Profanity." )
     },
 
     { CMD_PREAMBLE("/correct-editor",

src/profanity.c

@@ -20,7 +20,6 @@
 #include <string.h>
 
 #include <glib.h>
-#include <glib-unix.h>
 
 #include "profanity.h"
 #include "common.h"
@@ -71,12 +70,38 @@ static void _connect_default(const char* const account);
 pthread_mutex_t lock;
 static gboolean force_quit = FALSE;
 
-// Signal-driven flags consumed by the main loop. SIGTSTP and a STOPPED editor
-// child → drop the process group to the shell (mutt-style). SIGCONT →
-// refresh curses on return.
 static volatile sig_atomic_t suspend_requested = FALSE;
 static volatile sig_atomic_t cont_requested = FALSE;
 
+static void
+_handle_suspend_signals(void)
+{
+    if (cont_requested) {
+        cont_requested = FALSE;
+        if (!editor_is_active()) {
+            clearok(stdscr, TRUE);
+            ui_resize();
+        }
+    }
+
+    if (editor_check_stopped()) {
+        log_info("[Editor] stopped; aborting back to profanity");
+        suspend_requested = FALSE;
+        editor_emergency_kill();
+    } else if (suspend_requested) {
+        suspend_requested = FALSE;
+        if (editor_is_active()) {
+            log_info("[Editor] SIGTSTP from vim group; deferring to next poll");
+        } else {
+            log_info("[Suspend] dropping to shell");
+            if (!isendwin()) {
+                endwin();
+            }
+            kill(0, SIGSTOP);
+        }
+    }
+}
+
 void
 prof_run(gchar* log_level, gchar* account_name, gchar* config_file, gchar* log_file, gchar* theme_name, gchar** commands)
 {
@@ -100,36 +125,7 @@ prof_run(gchar* log_level, gchar* account_name, gchar* config_file, gchar* log_f
     int waittime = 0;
     while (cont && !force_quit) {
         log_stderr_handler();
-
-        // Resume from fg after SIGSTOP. Vim handles its own refresh.
-        if (cont_requested) {
-            cont_requested = FALSE;
-            if (!editor_is_active()) {
-                clearok(stdscr, TRUE);
-                ui_resize();
-            }
-        }
-
-        // Editor STOPPED → abort. Plain Ctrl-Z → drop to shell. While editor
-        // is active, swallow suspend_requested (race: vim's kill(0,SIGTSTP)
-        // beats waitpid seeing STOPPED) — next poll catches it.
-        if (editor_check_stopped()) {
-            log_info("[Editor] stopped; aborting back to profanity");
-            suspend_requested = FALSE;
-            editor_emergency_kill();
-        } else if (suspend_requested) {
-            suspend_requested = FALSE;
-            if (editor_is_active()) {
-                log_info("[Editor] SIGTSTP from vim group; deferring to next poll");
-            } else {
-                log_info("[Suspend] dropping to shell");
-                if (!isendwin()) {
-                    endwin();
-                }
-                kill(0, SIGSTOP);
-            }
-        }
-
+        _handle_suspend_signals();
         session_check_autoaway();
 
         line = commands ? *commands : inp_readline();
@@ -219,15 +215,6 @@ sigterm_handler(int sig)
     force_quit = TRUE;
 }
 
-// SIGUSR1 escape for an alive-but-stuck editor (WUNTRACED can't catch it).
-// Dispatched in the main loop. Trigger: `pkill -USR1 profanity`.
-static gboolean
-_emergency_resume_handler(gpointer data)
-{
-    editor_emergency_kill();
-    return G_SOURCE_CONTINUE;
-}
-
 static void
 sigtstp_handler(int sig)
 {
@@ -252,7 +239,6 @@ _init(char* log_level, char* config_file, char* log_file, char* theme_name)
     signal(SIGWINCH, ui_sigwinch_handler);
     signal(SIGTERM, sigterm_handler);
     signal(SIGHUP, sigterm_handler);
-    g_unix_signal_add(SIGUSR1, _emergency_resume_handler, NULL);
     if (pthread_mutex_init(&lock, NULL) != 0) {
         log_error("Mutex init failed");
         exit(1);

src/tools/editor.c

@@ -32,9 +32,7 @@ typedef struct EditorContext
     void* user_data;
 } EditorContext;
 
-// Re-entrancy guard (lost in the async-editor rewrite). Prevents a plugin
-// from spawning a second editor that would fight the first for the terminal.
-static gboolean editor_active = FALSE;
+static gboolean editor_active = FALSE; // re-entrancy guard
 static pid_t editor_pid = 0;
 
 static void

src/tools/editor.h

@@ -16,9 +16,7 @@
 
 gboolean launch_editor(gchar* initial_content, void (*callback)(gchar* content, void* data), void* user_data);
 
-// SIGUSR1 escape: SIGTERM the editor child. Use when WUNTRACED can't catch
-// it (alive but stuck). Wired in profanity.c.
-void editor_emergency_kill(void);
+void editor_emergency_kill(void); // SIGCONT+SIGTERM the editor child
 
 // TRUE if editor child is STOPPED (Ctrl-Z / :stop / gdb-attach). Does not
 // reap; g_child_watch keeps handling exit.

src/ui/chatwin.c

@@ -399,8 +399,6 @@ chatwin_outgoing_msg(ProfChatWin* chatwin, const char* const message, const char
         win_print_outgoing((ProfWin*)chatwin, enc_char, id, replace_id, display_message);
     }
 
-    plugins_post_chat_message_display(myjid->barejid, myjid->resourcepart, display_message);
-
     // Save last id and message for LMC
     // Note: if the same message is to be corrected several times, the id of the original message is used in each case
     // https://xmpp.org/extensions/xep-0308.html#rules
@@ -434,7 +432,6 @@ chatwin_outgoing_carbon(ProfChatWin* chatwin, ProfMessage* message)
 
     win_print_outgoing(window, enc_char, message->id, message->replace_id, message->plain);
 
-    plugins_post_chat_message_display(message->from_jid->barejid, message->from_jid->resourcepart, message->plain);
     message->plain = old_plain;
 
     int num = wins_get_num(window);
@@ -561,7 +558,6 @@ _chatwin_history(ProfChatWin* chatwin, const char* const contact_barejid)
             if (plugin_msg)
                 msg->plain = plugin_msg;
             win_print_history((ProfWin*)chatwin, msg);
-            plugins_post_chat_message_display(msg->from_jid->barejid, msg->from_jid->resourcepart, msg->plain);
             msg->plain = old_plain;
             curr = g_slist_next(curr);
         }
@@ -601,7 +597,6 @@ chatwin_db_history(ProfChatWin* chatwin, const gchar* start_time, const gchar* e
         } else {
             win_print_history((ProfWin*)chatwin, msg);
         }
-        plugins_post_chat_message_display(msg->from_jid->barejid, msg->from_jid->resourcepart, msg->plain);
         msg->plain = old_plain;
         curr = g_slist_next(curr);
     }

src/ui/inputwin.c

@@ -320,9 +320,7 @@ inp_get_line(void)
     while (!line) {
         line = inp_readline();
         ui_update();
-        // Let the editor child watch dispatch — otherwise a prompt raised
-        // mid-editor-session deadlocks here.
-        while (g_main_context_iteration(NULL, FALSE))
+        while (g_main_context_iteration(NULL, FALSE)) // non-blocking; bounded by ready sources
             ;
     }
     status_bar_clear_prompt();
@@ -352,9 +350,7 @@ inp_get_password(void)
     while (!password) {
         password = inp_readline();
         ui_update();
-        // Let the editor child watch dispatch — otherwise a prompt raised
-        // mid-editor-session deadlocks here.
-        while (g_main_context_iteration(NULL, FALSE))
+        while (g_main_context_iteration(NULL, FALSE)) // non-blocking; bounded by ready sources
             ;
     }
     get_password = FALSE;