Merge branch 'release/0.7.1-1'0.7.1-1

1 files changed, 4 insertions, 21 deletions

diff --git a/src/gui/indicator.vala b/src/gui/indicator.vala
index 55baaf1..ddd101b 100644
--- a/src/gui/indicator.vala
+++ b/src/gui/indicator.vala
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2011-2016 by Simon Schneegans
+// Copyright (c) 2011-2017 by Simon Schneegans
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -68,13 +68,6 @@ public class Indicator : GLib.Object {
 
     public Indicator() {
         string icon = "gnome-pie-symbolic";
-        var screen = (Gdk.X11.Screen)Gdk.Screen.get_default();
-        bool gnome_shell = false;
-
-        if (screen.get_window_manager_name() == "GNOME Shell") {
-            icon = "gnome-pie";
-            gnome_shell = true;
-        }
 
         #if HAVE_APPINDICATOR
 
@@ -85,19 +78,9 @@ public class Indicator : GLib.Object {
                 warning("Failed to get path of executable!");
             }
 
-            if (gnome_shell) {
-
-                if (GLib.File.new_for_path(path).query_exists()) {
-                    this.indicator = new AppIndicator.Indicator("Gnome-Pie", path + "/" + icon + ".svg",
-                                         AppIndicator.IndicatorCategory.APPLICATION_STATUS);
-                } else {
-                    this.indicator = new AppIndicator.Indicator("Gnome-Pie", icon,
-                                         AppIndicator.IndicatorCategory.APPLICATION_STATUS);
-                }
-            } else {
-                this.indicator = new AppIndicator.Indicator.with_path("Gnome-Pie", icon,
-                                     AppIndicator.IndicatorCategory.APPLICATION_STATUS, path);
-            }
+            this.indicator = new AppIndicator.Indicator.with_path("Gnome-Pie", icon,
+                                 AppIndicator.IndicatorCategory.APPLICATION_STATUS, path);
+
             var menu = new Gtk.Menu();
         #else
             this.indicator = new Gtk.StatusIcon();