[gnome-shell/wip/aggregate-menu: 35/58] network: Remove the Wired section



commit 880cdea64b9410e17c4665bee92089e2477015ed
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 |   54 -----------------------------------------------
 1 files changed, 0 insertions(+), 54 deletions(-)
---
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 6bc08c1..88e5793 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -20,7 +20,6 @@ const Util = imports.misc.util;
 
 const NMConnectionCategory = {
     INVALID: 'invalid',
-    WIRED: 'wired',
     WIRELESS: 'wireless',
     WWAN: 'wwan',
     VPN: 'vpn'
@@ -459,47 +458,6 @@ const NMDevice = new Lang.Class({
 });
 Signals.addSignalMethods(NMDevice.prototype);
 
-const NMDeviceSimple = new Lang.Class({
-    Name: 'NMDeviceSimple',
-    Extends: NMDevice,
-
-    _init: function(client, device, connections) {
-        this.category = NMConnectionCategory.WIRED;
-
-        this.parent(client, device, connections);
-    },
-
-    _createSection: function() {
-        this.parent();
-
-        // if we have only one connection (normal or automatic)
-        // we hide the connection list, and use the switch to control
-        // the device
-        // we can do it here because addConnection and removeConnection
-        // both call _createSection at some point
-        this.section.actor.visible = this._connections.length > 1;
-    }
-});
-
-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() {
-        if (this._device.active_connection.state == NetworkManager.ActiveConnectionState.ACTIVATING)
-            return 'network-wired-acquiring-symbolic';
-        else
-            return 'network-wired-symbolic';
-    },
-});
-
 const NMDeviceModem = new Lang.Class({
     Name: 'NMDeviceModem',
     Extends: NMDevice,
@@ -1260,23 +1218,17 @@ 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;
-        this._dtypes[NetworkManager.DeviceType.INFINIBAND] = NMDeviceSimple;
         // TODO: WiMax support
 
         // 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_VPN_SETTING_NAME] = NMConnectionCategory.VPN;
 
         NMClient.Client.new_async(null, Lang.bind(this, this._clientGot));
@@ -1311,12 +1263,6 @@ const NMApplet = new Lang.Class({
         this._section = new PopupMenu.PopupMenuSection();
         this.menu.addMenuItem(this._section);
 
-        this._devices.wired = {
-            section: new PopupMenu.PopupMenuSection(),
-            devices: [ ],
-        };
-        this._section.addMenuItem(this._devices.wired.section);
-
         this._devices.wireless = {
             section: new PopupMenu.PopupMenuSection(),
             devices: [ ],


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