[gnome-shell/wip/aggregate-menu: 45/74] network: Hide the signal icon in the mobile broadband section

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

commit dcfed30dd3244eca0d842114ff4b80675554171e
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Apr 29 15:11:14 2013 -0400

    network: Hide the signal icon in the mobile broadband section
    
    This also removes the last use of PopupImageMenuItem, so remove
    that as well.

 js/ui/popupMenu.js      |   20 --------------------
 js/ui/status/network.js |    8 ++------
 2 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 2088943..f435d5a 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -546,26 +546,6 @@ const PopupSwitchMenuItem = new Lang.Class({
     }
 });
 
-const PopupImageMenuItem = new Lang.Class({
-    Name: 'PopupImageMenuItem',
-    Extends: PopupBaseMenuItem,
-
-    _init: function (text, iconName, params) {
-        this.parent(params);
-
-        this.label = new St.Label({ text: text });
-        this.addActor(this.label);
-        this._icon = new St.Icon({ style_class: 'popup-menu-icon' });
-        this.addActor(this._icon, { align: St.Align.END });
-
-        this.setIcon(iconName);
-    },
-
-    setIcon: function(name) {
-        this._icon.icon_name = name;
-    }
-});
-
 const PopupMenuBase = new Lang.Class({
     Name: 'PopupMenuBase',
     Abstract: true,
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 88653ad..c113c23 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -546,9 +546,6 @@ const NMDeviceModem = new Lang.Class({
                 }
             }));
             this._signalQualityId = this.mobileDevice.connect('notify::signal-quality', Lang.bind(this, 
function() {
-                if (this._operatorItem) {
-                    this._operatorItem.setIcon(this._getSignalIcon());
-                }
                 this.emit('icon-changed');
             }));
         }
@@ -579,9 +576,8 @@ const NMDeviceModem = new Lang.Class({
 
         if (this.mobileDevice) {
             // If operator_name is null, just pass the empty string, as the item is hidden anyway
-            this._operatorItem = new PopupMenu.PopupImageMenuItem(this.mobileDevice.operator_name || '',
-                                                                  this._getSignalIcon(),
-                                                                  { reactive: false });
+            this._operatorItem = new PopupMenu.PopupMenuItem(this.mobileDevice.operator_name || '',
+                                                             { style_class: 'popup-status-menu-item' });
             if (!this.mobileDevice.operator_name)
                 this._operatorItem.actor.hide();
             this.section.addMenuItem(this._operatorItem);