From c38939902f5df51316fc3f06ccc5884c6d17fa4e Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 28 May 2014 15:24:22 -0400 Subject: [PATCH] notificationDaemon: Remove the special-case hack for system tray icons Nothing in the system actually has a standard system tray icon anymore, so this hack isn't necessary. --- js/ui/notificationDaemon.js | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js index dd2566117..6e78bf5f4 100644 --- a/js/ui/notificationDaemon.js +++ b/js/ui/notificationDaemon.js @@ -91,21 +91,6 @@ const rewriteRules = { ] }; -const STANDARD_TRAY_ICON_IMPLEMENTATIONS = { - 'bluetooth-applet': 'bluetooth', - 'gnome-volume-control-applet': 'volume', // renamed to gnome-sound-applet - // when moved to control center - 'gnome-sound-applet': 'volume', - 'nm-applet': 'network', - 'gnome-power-manager': 'battery', - 'keyboard': 'keyboard', - 'a11y-keyboard': 'a11y', - 'kbd-scrolllock': 'keyboard', - 'kbd-numlock': 'keyboard', - 'kbd-capslock': 'keyboard', - 'ibus-ui-gtk': 'keyboard' -}; - const FdoNotificationDaemon = new Lang.Class({ Name: 'FdoNotificationDaemon', @@ -509,10 +494,6 @@ const FdoNotificationDaemon = new Lang.Class({ }, _onTrayIconAdded: function(o, icon) { - let wmClass = icon.wm_class ? icon.wm_class.toLowerCase() : ''; - if (STANDARD_TRAY_ICON_IMPLEMENTATIONS[wmClass] !== undefined) - return; - let source = this._getSource(icon.title || icon.wm_class || C_("program", "Unknown"), icon.pid, null, null, icon); },