From 7d16a9be66e05de689e4ca118f5364b70ccef501 Mon Sep 17 00:00:00 2001
From: Nathan Dyer <nathandyer@fastmail.com>
Date: Fri, 3 Mar 2023 11:41:46 -0500
Subject: [PATCH] Make symbolic icon white instead of black so it's visible in
 the menu.

---
 .../files/securedrop-symbolic.png             | Bin 2563 -> 5475 bytes
 .../tasks/install_shell_extension.yml         |   4 ++--
 .../tails-config/templates/extension.js.in    |  14 ++++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/install_files/ansible-base/roles/tails-config/files/securedrop-symbolic.png b/install_files/ansible-base/roles/tails-config/files/securedrop-symbolic.png
index e75b33219a0c670462bc9462cd0e66ba31a9e874..3c78d8ec5ab709ae926aea999ddadc5ba782f4e0 100644
GIT binary patch
literal 5475
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
aH{dMZnr18vtfD}r597Fcx|A&pUHxxQnMR}l

delta 2554
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
Q5&!@I07*qoM6N<$g6`JS8vp<R

diff --git a/install_files/ansible-base/roles/tails-config/tasks/install_shell_extension.yml b/install_files/ansible-base/roles/tails-config/tasks/install_shell_extension.yml
index 8f66ae3b5cd..e592b331170 100644
--- a/install_files/ansible-base/roles/tails-config/tasks/install_shell_extension.yml
+++ b/install_files/ansible-base/roles/tails-config/tasks/install_shell_extension.yml
@@ -107,7 +107,7 @@
   become: yes
   copy:
     src: securedrop-symbolic.png
-    dest: "{{ tails_config_live_dotfiles }}/.local/share/icons/"
+    dest: "{{ tails_config_live_dotfiles }}/.local/share/gnome-shell/extensions/securedrop@securedrop.freedom.press/icons/"
     owner: amnesia
     group: amnesia
     
@@ -115,7 +115,7 @@
   become: yes
   copy:
     src: securedrop-symbolic.png
-    dest: "/home/amnesia/.local/share/icons/"
+    dest: "/home/amnesia/.local/share/gnome-shell/extensions/securedrop@securedrop.freedom.press/icons/"
     owner: amnesia
     group: amnesia
 
diff --git a/install_files/ansible-base/roles/tails-config/templates/extension.js.in b/install_files/ansible-base/roles/tails-config/templates/extension.js.in
index fe24eef07da..e102d721383 100644
--- a/install_files/ansible-base/roles/tails-config/templates/extension.js.in
+++ b/install_files/ansible-base/roles/tails-config/templates/extension.js.in
@@ -2,7 +2,7 @@
 
 const GETTEXT_DOMAIN = 'securedrop';
 
-const {Clutter, GObject, GLib, St } = imports.gi;
+const {Clutter, GObject, GLib } = imports.gi;
 
 const Util = imports.misc.util;
 const ExtensionUtils = imports.misc.extensionUtils;
@@ -10,6 +10,10 @@ const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 
+const St = imports.gi.St;
+const CurrentExtension = imports.misc.extensionUtils.getCurrentExtension();
+const Gio = imports.gi.Gio;
+
 const source_interface_address = "{{ item.0.source_interface_address }}";
 const journalist_interface_address = "{{ item.0.journalist_interface_address }}";
 const app_server_hostname = "{{ item.0.app_hostname }}";
@@ -30,11 +34,9 @@ class Indicator extends PanelMenu.Button {
         if (exit == 0) {
             is_admin = true;
         }
-
-        let icon = new St.Icon({
-            icon_name: 'securedrop-symbolic',
-            style_class: 'system-status-icon',
-        });
+        
+        let gicon = Gio.icon_new_for_string(CurrentExtension.path + "/icons/securedrop-symbolic.png");
+	let icon = new St.Icon({ gicon });
         
         let label = new St.Label({
             text: 'SecureDrop',