brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

network: Remove old API

Browse Source 
The underscored properties were removed a while ago.

https://bugzilla.gnome.org/show_bug.cgi?id=677515
This commit is contained in:
Jasper St. Pierre 2012-06-05 17:32:52 -04:00
parent b07345a55c
commit 6382eeb8fd
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
js/ui/status/network.js
View File

@ -297,7 +297,7 @@ const NMDevice = new Lang.Class({
this._client = client; this._client = client;
this._connections = [ ]; this._connections = [ ];
for (let i = 0; i < connections.length; i++) { for (let i = 0; i < connections.length; i++) {
if (!connections[i]._uuid) if (!connections[i].get_uuid())
continue; continue;
if (!this.connectionValid(connections[i])) if (!this.connectionValid(connections[i]))
continue; continue;
@ -613,7 +613,7 @@ const NMDevice = new Lang.Class({
let title; let title;
let active = this._activeConnection._connection; let active = this._activeConnection._connection;
if (active) { if (active) {
title = active._name; title = active.get_id();
} else { } else {
/* TRANSLATORS: this is the indication that a connection for another logged in user is active, /* TRANSLATORS: this is the indication that a connection for another logged in user is active,
and we cannot access its settings (including the name) */ and we cannot access its settings (including the name) */
@ -1342,7 +1342,7 @@ const NMDeviceWireless = new Lang.Class({
}, },
_createAPItem: function(connection, accessPointObj, useConnectionName) { _createAPItem: function(connection, accessPointObj, useConnectionName) {
let item = new NMNetworkMenuItem(accessPointObj.accessPoints, useConnectionName ? connection._name : undefined); let item = new NMNetworkMenuItem(accessPointObj.accessPoints, useConnectionName ? connection.get_id() : undefined);
item._connection = connection; item._connection = connection;
item.connect('activate', Lang.bind(this, function() { item.connect('activate', Lang.bind(this, function() {
let accessPoints = sortAccessPoints(accessPointObj.accessPoints); let accessPoints = sortAccessPoints(accessPointObj.accessPoints);
@ -1452,27 +1452,19 @@ const NMDeviceWireless = new Lang.Class({
}, },
_createActiveConnectionItem: function() { _createActiveConnectionItem: function() {
let icon, title; let title;
if (this._activeConnection && this._activeConnection._connection) { if (this._activeConnection && this._activeConnection._connection)
let connection = this._activeConnection._connection; title = this._activeConnection._connection.get_id();
if (this._activeNetwork) else
this._activeConnectionItem = new NMNetworkMenuItem(this._activeNetwork.accessPoints, undefined, title = _("Connected (private)");
{ reactive: false });
else if (this._activeNetwork)
this._activeConnectionItem = new PopupMenu.PopupImageMenuItem(connection._name, this._activeConnectionItem = new NMNetworkMenuItem(this._activeNetwork.accessPoints, undefined,
'network-wireless-connected', { reactive: false });
{ reactive: false }); else
} else { this._activeConnectionItem = new PopupMenu.PopupImageMenuItem(title,
// We cannot read the connection (due to ACL, or API incompatibility), but we still show signal if we have it 'network-wireless-connected',
let menuItem; { reactive: false });
if (this._activeNetwork)
this._activeConnectionItem = new NMNetworkMenuItem(this._activeNetwork.accessPoints, undefined,
{ reactive: false });
else
this._activeConnectionItem = new PopupMenu.PopupImageMenuItem(_("Connected (private)"),
'network-wireless-connected',
{ reactive: false });
}
this._activeConnectionItem.setShowDot(true); this._activeConnectionItem.setShowDot(true);
}, },