From 803786430eb8b20dffe5d4cea75d88ec9f701477 Mon Sep 17 00:00:00 2001
From: Dan <46821332+nsadeveloper789@users.noreply.github.com>
Date: Mon, 9 Sep 2024 11:25:59 -0400
Subject: [PATCH] GP-0: Deconflict icon names: BSim vs Debugger.

---
 Ghidra/Features/BSim/certification.manifest         |   4 ++--
 Ghidra/Features/BSim/data/bsim.theme.properties     |   4 ++--
 .../resources/images/{connect.png => connected.png} | Bin
 .../images/{disconnect.png => disconnected.png}     | Bin
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename Ghidra/Features/BSim/src/main/resources/images/{connect.png => connected.png} (100%)
 rename Ghidra/Features/BSim/src/main/resources/images/{disconnect.png => disconnected.png} (100%)

diff --git a/Ghidra/Features/BSim/certification.manifest b/Ghidra/Features/BSim/certification.manifest
index 137ac8dcbf..ed03fd0803 100755
--- a/Ghidra/Features/BSim/certification.manifest
+++ b/Ghidra/Features/BSim/certification.manifest
@@ -42,8 +42,8 @@ src/main/help/help/topics/BSimSearchPlugin/images/BSimSearchDialog.png||GHIDRA||
 src/main/help/help/topics/BSimSearchPlugin/images/ManageServersDialog.png||GHIDRA||||END|
 src/main/resources/bsim.log4j.xml||GHIDRA||||END|
 src/main/resources/images/checkmark_yellow.gif||GHIDRA||||END|
-src/main/resources/images/connect.png||FAMFAMFAM Icons - CC 2.5||||END|
-src/main/resources/images/disconnect.png||FAMFAMFAM Icons - CC 2.5||||END|
+src/main/resources/images/connected.png||GHIDRA||||END|
+src/main/resources/images/disconnected.png||GHIDRA||||END|
 src/main/resources/images/flag_green.png||FAMFAMFAM Icons - CC 2.5|||famfamfam silk icon set|END|
 src/main/resources/images/preferences-desktop-user-password.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
 src/main/resources/images/preferences-web-browser-shortcuts-32.png||Oxygen Icons - LGPL 3.0|||Oxygen icon theme (dual license; LGPL or CC-SA-3.0)|END|
diff --git a/Ghidra/Features/BSim/data/bsim.theme.properties b/Ghidra/Features/BSim/data/bsim.theme.properties
index 497af941d8..2e319e950b 100644
--- a/Ghidra/Features/BSim/data/bsim.theme.properties
+++ b/Ghidra/Features/BSim/data/bsim.theme.properties
@@ -14,7 +14,7 @@ icon.bsim.results.status.ignored = checkmark_yellow.gif
 
 icon.bsim.functions.table = FunctionScope.gif
 
-icon.bsim.connected = connect.png
-icon.bsim.disconnected = disconnect.png
+icon.bsim.connected = connected.png
+icon.bsim.disconnected = disconnected.png
 
 [Dark Defaults]
diff --git a/Ghidra/Features/BSim/src/main/resources/images/connect.png b/Ghidra/Features/BSim/src/main/resources/images/connected.png
similarity index 100%
rename from Ghidra/Features/BSim/src/main/resources/images/connect.png
rename to Ghidra/Features/BSim/src/main/resources/images/connected.png
diff --git a/Ghidra/Features/BSim/src/main/resources/images/disconnect.png b/Ghidra/Features/BSim/src/main/resources/images/disconnected.png
similarity index 100%
rename from Ghidra/Features/BSim/src/main/resources/images/disconnect.png
rename to Ghidra/Features/BSim/src/main/resources/images/disconnected.png