From 37080e1b5d12a4e128d73c7011ef6e97f8df1ec7 Mon Sep 17 00:00:00 2001
From: Lawrence37 <45837045+Lawrence37@users.noreply.github.com>
Date: Fri, 13 May 2022 20:39:31 -0700
Subject: [PATCH] Fix some history messages (#6474)

Use correct key for spot removal history message.

Remove B&W channel mixer auto enabled message when changing the filter
color.

Replace hard-coded input color profile strings.
---
 rtgui/blackwhite.cc |  1 -
 rtgui/icmpanel.cc   | 12 ++++++------
 rtgui/spot.cc       |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/rtgui/blackwhite.cc b/rtgui/blackwhite.cc
index e713f1450..7b54f09d2 100644
--- a/rtgui/blackwhite.cc
+++ b/rtgui/blackwhite.cc
@@ -811,7 +811,6 @@ void BlackWhite::filterChanged ()
 
     if (listener && (multiImage || getEnabled())) {
         listener->panelChanged (EvBWfilter, filter->get_active_text ());
-        listener->panelChanged (EvAutoch, M("GENERAL_ENABLED"));
     }
 }
 
diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc
index 45d0f6622..90528e831 100644
--- a/rtgui/icmpanel.cc
+++ b/rtgui/icmpanel.cc
@@ -787,8 +787,8 @@ void ICMPanel::read(const ProcParams* pp, const ParamsEdited* pedited)
     ConnectionBlocker willconn_(willconn);
     ConnectionBlocker wprimconn_(wprimconn);
 
-    if (pp->icm.inputProfile.substr(0, 5) != "file:" && !ipDialog->get_filename().empty()) {
-        ipDialog->set_filename(pp->icm.inputProfile);
+    if (pp->icm.inputProfile.substr(0, 5) != "file:") {
+        ipDialog->set_filename(" ");
     }
 
     if (pp->icm.inputProfile == "(none)") {
@@ -1908,13 +1908,13 @@ void ICMPanel::ipChanged()
     Glib::ustring profname;
 
     if (inone->get_active()) {
-        profname = "(none)";
+        profname = inone->get_label();
     } else if (iembedded->get_active()) {
-        profname = "(embedded)";
+        profname = iembedded->get_label();
     } else if (icamera->get_active()) {
-        profname = "(camera)";
+        profname = icamera->get_label();
     } else if (icameraICC->get_active()) {
-        profname = "(cameraICC)";
+        profname = icameraICC->get_label();
     } else {
         profname = ipDialog->get_filename();
     }
diff --git a/rtgui/spot.cc b/rtgui/spot.cc
index 515884964..2f9910b70 100644
--- a/rtgui/spot.cc
+++ b/rtgui/spot.cc
@@ -117,8 +117,8 @@ Spot::Spot() :
     link.setActive (false);
 
     auto m = ProcEventMapper::getInstance();
-    EvSpotEnabled = m->newEvent(ALLNORAW, "TP_SPOT_LABEL");
-    EvSpotEnabledOPA = m->newEvent(SPOTADJUST, "TP_SPOT_LABEL");
+    EvSpotEnabled = m->newEvent(ALLNORAW, "HISTORY_MSG_SPOT");
+    EvSpotEnabledOPA = m->newEvent(SPOTADJUST, "HISTORY_MSG_SPOT");
     EvSpotEntry = m->newEvent(SPOTADJUST, "HISTORY_MSG_SPOT_ENTRY");
     EvSpotEntryOPA = m->newEvent(SPOTADJUST, "HISTORY_MSG_SPOT_ENTRY");