diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-25 06:51:21 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-25 06:51:21 +0200 |
commit | 3b49907c8b012b0a62d6e264f62bf03b13e68a51 (patch) | |
tree | e9acc532002ca7a52810325eee1f16d6d17f9d27 /src/gui/indicator.vala | |
parent | 394ad3b32f9f79775bcac4c6cc2a4dfa74586800 (diff) | |
parent | 334f925d5866faaf6ed36a4269d14bcc7aa86a76 (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/gui/indicator.vala')
-rw-r--r-- | src/gui/indicator.vala | 25 |
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(); |