From b96cf2042ae5978c58451a947372fc244f4271b6 Mon Sep 17 00:00:00 2001
From: "Jason D. Clinton" <me@jasonclinton.com>
Date: Fri, 24 Sep 2010 14:53:50 -0500
Subject: [PATCH] [StatusIconDispatcher] Add keyboard and display icons to tray
 icon list

---
 js/ui/panel.js                | 2 +-
 js/ui/statusIconDispatcher.js | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/js/ui/panel.js b/js/ui/panel.js
index 1f05710a1..9f317deb1 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -29,7 +29,7 @@ const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
 const SPINNER_UPDATE_TIMEOUT = 130;
 const SPINNER_SPEED = 0.02;
 
-const STANDARD_TRAY_ICON_ORDER = ['a11y', 'keyboard', 'volume', 'bluetooth', 'network', 'battery'];
+const STANDARD_TRAY_ICON_ORDER = ['a11y', 'display', 'keyboard', 'volume', 'bluetooth', 'network', 'battery'];
 const STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION = {
     'a11y': imports.ui.status.accessibility.ATIndicator
 };
diff --git a/js/ui/statusIconDispatcher.js b/js/ui/statusIconDispatcher.js
index 85d7ffefb..fc754c9f4 100644
--- a/js/ui/statusIconDispatcher.js
+++ b/js/ui/statusIconDispatcher.js
@@ -11,7 +11,9 @@ const STANDARD_TRAY_ICON_IMPLEMENTATIONS = {
     'bluetooth-applet': 'bluetooth',
     'gnome-volume-control-applet': 'volume',
     'nm-applet': 'network',
-    'gnome-power-manager': 'battery'
+    'gnome-power-manager': 'battery',
+    'keyboard': 'keyboard',
+    'gnome-settings-daemon': 'display'
 };
 
 function StatusIconDispatcher() {