[gnome-shell/wip/aggregate-menu: 33/36] network: Remove the Wired section



commit e9473b968a9676397ecb95b92cacd5519ef7a75f
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Apr 29 15:38:23 2013 -0400

    network: Remove the Wired section
    
    This isn't in the new mockups.

 js/ui/status/network.js |   34 ----------------------------------
 1 files changed, 0 insertions(+), 34 deletions(-)
---
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 7d633b3..428e423 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -156,8 +156,6 @@ const NMDevice = new Lang.Class({
 
         if (this._connections.length <= 1) {
             // We need to show the automatic connection again
-            // (or in the case of NMDeviceWired, we want to hide
-            // the only explicit connection)
             this._queueCreateSection();
         }
     },
@@ -458,25 +456,6 @@ const NMDeviceSimple = new Lang.Class({
     }
 });
 
-const NMDeviceWired = new Lang.Class({
-    Name: 'NMDeviceWired',
-    Extends: NMDeviceSimple,
-
-    _init: function(client, device, connections) {
-        device._description = _("Wired");
-        this.category = NMConnectionCategory.WIRED;
-
-        this.parent(client, device, connections);
-    },
-
-    getIndicatorIcon: function(mc) {
-        if (mc.state == NetworkManager.ActiveConnectionState.ACTIVATING)
-            return 'network-wired-acquiring-symbolic';
-        else
-            return 'network-wired-symbolic';
-    },
-});
-
 const NMDeviceModem = new Lang.Class({
     Name: 'NMDeviceModem',
     Extends: NMDevice,
@@ -1321,7 +1300,6 @@ const NMApplet = new Lang.Class({
 
         // Device types
         this._dtypes = { };
-        this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
         this._dtypes[NetworkManager.DeviceType.WIFI] = NMDeviceWireless;
         this._dtypes[NetworkManager.DeviceType.MODEM] = NMDeviceModem;
         this._dtypes[NetworkManager.DeviceType.BT] = NMDeviceBluetooth;
@@ -1337,13 +1315,9 @@ const NMApplet = new Lang.Class({
         // Connection types
         this._ctypes = { };
         this._ctypes[NetworkManager.SETTING_WIRELESS_SETTING_NAME] = NMConnectionCategory.WIRELESS;
-        this._ctypes[NetworkManager.SETTING_WIRED_SETTING_NAME] = NMConnectionCategory.WIRED;
-        this._ctypes[NetworkManager.SETTING_PPPOE_SETTING_NAME] = NMConnectionCategory.WIRED;
-        this._ctypes[NetworkManager.SETTING_PPP_SETTING_NAME] = NMConnectionCategory.WIRED;
         this._ctypes[NetworkManager.SETTING_BLUETOOTH_SETTING_NAME] = NMConnectionCategory.WWAN;
         this._ctypes[NetworkManager.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN;
         this._ctypes[NetworkManager.SETTING_GSM_SETTING_NAME] = NMConnectionCategory.WWAN;
-        this._ctypes[NetworkManager.SETTING_INFINIBAND_SETTING_NAME] = NMConnectionCategory.WIRED;
         this._ctypes[NetworkManager.SETTING_VLAN_SETTING_NAME] = NMConnectionCategory.VIRTUAL;
         this._ctypes[NetworkManager.SETTING_BOND_SETTING_NAME] = NMConnectionCategory.VIRTUAL;
         this._ctypes[NetworkManager.SETTING_BRIDGE_SETTING_NAME] = NMConnectionCategory.VIRTUAL;
@@ -1380,13 +1354,6 @@ const NMApplet = new Lang.Class({
         this._devices = { };
         this._virtualDevices = [ ];
 
-        this._devices.wired = {
-            section: new PopupMenu.PopupMenuSection(),
-            devices: [ ],
-        };
-        this._devices.wired.section.actor.hide();
-        this.menu.addMenuItem(this._devices.wired.section);
-
         this._devices.virtual = {
             section: new PopupMenu.PopupMenuSection(),
             devices: [ ],
@@ -1782,7 +1749,6 @@ const NMApplet = new Lang.Class({
 
         this._statusSection.actor.hide();
 
-        this._syncSectionTitle(NMConnectionCategory.WIRED);
         this._syncSectionTitle(NMConnectionCategory.VIRTUAL);
         this._syncSectionTitle(NMConnectionCategory.WIRELESS);
         this._syncSectionTitle(NMConnectionCategory.WWAN);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]