[gnome-shell/wip/aggregate-menu: 41/99] network: "Remove" support for dial-up modems
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/aggregate-menu: 41/99] network: "Remove" support for dial-up modems
- Date: Wed, 12 Jun 2013 20:15:30 +0000 (UTC)
commit b4b0148a93853d38f6f9a2c3ca8c7c8df0acf270
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Jun 12 15:27:09 2013 -0400
network: "Remove" support for dial-up modems
NetworkManager has never supported dial-up modems, which are the
only case we have a modem device without any of these capabilities.
js/ui/status/network.js | 23 +----------------------
1 files changed, 1 insertions(+), 22 deletions(-)
---
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index bb3ca60..22c774c 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -581,46 +581,25 @@ const NMDeviceWired = new Lang.Class({
const NMDeviceModem = new Lang.Class({
Name: 'NMDeviceModem',
Extends: NMDevice,
+ category: NMConnectionCategory.WWAN,
_init: function(client, device, connections) {
- let is_wwan = false;
-
device._description = _("Mobile broadband");
this._enabled = true;
this.mobileDevice = null;
- this._connectionType = 'ppp';
this._capabilities = device.current_capabilities;
// Support new ModemManager1 devices
if (device.udi.indexOf('/org/freedesktop/ModemManager1/Modem') == 0) {
- is_wwan = true;
this.mobileDevice = new ModemManager.BroadbandModem(device.udi, device.current_capabilities);
- if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) {
- this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
- } else if (this._capabilities & NetworkManager.DeviceModemCapabilities.LTE) {
- this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
- } else if (this._capabilities & NetworkManager.DeviceModemCapabilities.CDMA_EVDO) {
- this._connectionType = NetworkManager.SETTING_CDMA_SETTING_NAME;
- }
} else if (this._capabilities & NetworkManager.DeviceModemCapabilities.GSM_UMTS) {
- is_wwan = true;
this.mobileDevice = new ModemManager.ModemGsm(device.udi);
- this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
} else if (this._capabilities & NetworkManager.DeviceModemCapabilities.CDMA_EVDO) {
- is_wwan = true;
this.mobileDevice = new ModemManager.ModemCdma(device.udi);
- this._connectionType = NetworkManager.SETTING_CDMA_SETTING_NAME;
} else if (this._capabilities & NetworkManager.DeviceModemCapabilities.LTE) {
- is_wwan = true;
this.mobileDevice = new ModemManager.ModemGsm(device.udi);
- this._connectionType = NetworkManager.SETTING_GSM_SETTING_NAME;
}
- if (is_wwan)
- this.category = NMConnectionCategory.WWAN;
- else
- this.category = NMConnectionCategory.WIRED;
-
if (this.mobileDevice) {
this._operatorNameId = this.mobileDevice.connect('notify::operator-name', Lang.bind(this,
function() {
if (this._operatorItem) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]