[gnome-shell/wip/aggregate-menu: 61/62] power: Move the Power Off indicator to the power menu

[Jasper St. Pierre <jstpierre src gnome org>]

commit 9f18ffb270d4edbfacecf67c47916ac3b9728b41
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Jun 17 18:19:20 2013 -0400

    power: Move the Power Off indicator to the power menu
    
    It's only supposed to show if we have a battery, and hooking into
    the power system is the easiest way of making that happen.

 js/ui/panel.js         |    3 +--
 js/ui/status/power.js  |    4 ++--
 js/ui/status/system.js |    2 --
 3 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/js/ui/panel.js b/js/ui/panel.js
index f694a8b..1295749 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -938,9 +938,8 @@ const AggregateMenu = new Lang.Class({
         this._system = new imports.ui.status.system.Indicator();
 
         this._indicators.add_child(this._network.indicators);
-        this._indicators.add_child(this._power.indicators);
         this._indicators.add_child(this._volume.indicators);
-        this._indicators.add_child(this._system.indicators);
+        this._indicators.add_child(this._power.indicators);
         this._indicators.add_child(new St.Label({ text: '\u25BE' }));
 
         this.menu.addMenuItem(this._volume.menu);
diff --git a/js/ui/status/power.js b/js/ui/status/power.js
index 82568da..3d2b078 100644
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -126,10 +126,10 @@ const Indicator = new Lang.Class({
         if (icon) {
             let gicon = Gio.icon_new_for_string(icon);
             this._primaryIndicator.gicon = gicon;
-            this._primaryIndicator.show();
             this._batteryItem.icon.gicon = gicon;
         } else {
-            this._primaryIndicator.hide();
+            // If there's no battery, then we use the power icon.
+            this._primaryIndicator.gicon = 'system-shutdown-symbolic';
         }
     },
 
diff --git a/js/ui/status/system.js b/js/ui/status/system.js
index 5cb3c77..ab4145d 100644
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -47,8 +47,6 @@ const Indicator = new Lang.Class({
     _init: function() {
         this.parent();
 
-        this._primaryIndicator = this.addIndicator(new Gio.ThemedIcon({ name: 'system-shutdown-symbolic' }));
-
         this._screenSaverSettings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
         this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
         this._privacySettings = new Gio.Settings({ schema: PRIVACY_SCHEMA });