From eda316eb3c7870facebc4273d5fb4844b27601b7 Mon Sep 17 00:00:00 2001
From: Hylke Bons <hi@planetpeanut.uk>
Date: Sun, 5 Aug 2018 15:54:41 +0100
Subject: [PATCH] linux statusicon: Use app id variable for icon lookup

---
 SparkleShare/Linux/StatusIcon.cs    | 6 +++---
 SparkleShare/Linux/UserInterface.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SparkleShare/Linux/StatusIcon.cs b/SparkleShare/Linux/StatusIcon.cs
index b64f49e5..824e081c 100644
--- a/SparkleShare/Linux/StatusIcon.cs
+++ b/SparkleShare/Linux/StatusIcon.cs
@@ -51,13 +51,13 @@ namespace SparkleShare {
             if (use_appindicator) {
                 #if HAVE_APP_INDICATOR
                 indicator = new Indicator ("sparkleshare", "sparkleshare", (int) IndicatorCategory.ApplicationStatus) {
-                    IconName = "org.sparkleshare.SparkleShare-symbolic",
+                    IconName = UserInterface.APP_ID + "-symbolic",
                     Status   = (int) IndicatorStatus.Active
                 };
                 #endif
 
             } else {
-                this.status_icon = new Gtk.StatusIcon { IconName = "org.sparkleshare.SparkleShare" };
+                this.status_icon = new Gtk.StatusIcon { IconName = UserInterface.APP_ID };
                 this.status_icon.Activate  += ShowMenu; // Primary mouse button click
                 this.status_icon.PopupMenu += ShowMenu; // Secondary mouse button click
             }
@@ -127,7 +127,7 @@ namespace SparkleShare {
             this.state_item = new MenuItem (Controller.StateText) { Sensitive = false };
 
             ImageMenuItem folder_item = new SparkleMenuItem ("SparkleShare");
-            folder_item.Image = new Image (UserInterfaceHelpers.GetIcon ("org.sparkleshare.SparkleShare", 16));
+            folder_item.Image = new Image (UserInterfaceHelpers.GetIcon (UserInterface.APP_ID, 16));
             folder_item.Submenu = new Menu ();
 
             this.menu.Add (this.state_item);
diff --git a/SparkleShare/Linux/UserInterface.cs b/SparkleShare/Linux/UserInterface.cs
index 6e5eebd6..22488e70 100644
--- a/SparkleShare/Linux/UserInterface.cs
+++ b/SparkleShare/Linux/UserInterface.cs
@@ -38,7 +38,7 @@ namespace SparkleShare
         public string SecondaryTextColor;
         public string SecondaryTextColorSelected;
 
-        public readonly string APP_ID = "org.sparkleshare.SparkleShare.Nightly";
+        public static readonly string APP_ID = "org.sparkleshare.SparkleShare.Nightly";
         Application application;