[gnome-shell/wip/aggregate-menu: 48/74] network: Make Bluetooth devices into Modem devices



commit e7470d3ad2306f6c04a2c57de731c1c6673f0cbb
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Jul 15 13:36:20 2013 -0400

    network: Make Bluetooth devices into Modem devices
    
    We shouldn't differentiate between mobile devices depending
    on the type of connection technology they use.

 js/ui/status/network.js |   32 +-------------------------------
 1 files changed, 1 insertions(+), 31 deletions(-)
---
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 88e5793..0b40860 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -558,36 +558,6 @@ const NMDeviceModem = new Lang.Class({
     }
 });
 
-const NMDeviceBluetooth = new Lang.Class({
-    Name: 'NMDeviceBluetooth',
-    Extends: NMDevice,
-
-    _init: function(client, device, connections) {
-        device._description = _("Bluetooth");
-
-        this.category = NMConnectionCategory.WWAN;
-
-        this.parent(client, device, connections);
-    },
-
-    _activateAutomaticConnection: function() {
-        // FIXME: DUN devices are configured like modems, so
-        // We need to spawn the mobile wizard
-        // but the network panel doesn't support bluetooth at the moment
-        // so we just create an empty connection and hope
-        // that this phone supports PAN
-
-        return this.parent();
-    },
-
-    getIndicatorIcon: function() {
-        if (this._device.active_connection.state == NetworkManager.ActiveConnectionState.ACTIVATING)
-            return 'network-wired-acquiring-symbolic';
-        else
-            return 'network-wired-symbolic';
-    },
-});
-
 const NMDeviceWireless = new Lang.Class({
     Name: 'NMDeviceWireless',
     Extends: NMDevice,
@@ -1220,7 +1190,7 @@ const NMApplet = new Lang.Class({
         this._dtypes = { };
         this._dtypes[NetworkManager.DeviceType.WIFI] = NMDeviceWireless;
         this._dtypes[NetworkManager.DeviceType.MODEM] = NMDeviceModem;
-        this._dtypes[NetworkManager.DeviceType.BT] = NMDeviceBluetooth;
+        this._dtypes[NetworkManager.DeviceType.BT] = NMDeviceModem;
         // TODO: WiMax support
 
         // Connection types


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