NetworkMenu: use async initialization for libnm-glib objects
NMClient recently got more heavyweight, with a property holding supported connections. As fully initializing a NMObject is a recursive operation and requires multiple DBus calls, switch to async initalization for NMClient and NMRemoteSettings. https://bugzilla.gnome.org/show_bug.cgi?id=683288
This commit is contained in:
Giovanni Campagna
parent
2af368ab82
commit
382cc52baa
@ -1669,7 +1669,59 @@ const NMApplet = new Lang.Class({
|
|||||||
this.secondaryIcon = this.addIcon(new Gio.ThemedIcon({ name: 'network-vpn-symbolic' }));
|
this.secondaryIcon = this.addIcon(new Gio.ThemedIcon({ name: 'network-vpn-symbolic' }));
|
||||||
this.secondaryIcon.hide();
|
this.secondaryIcon.hide();
|
||||||
|
|
||||||
this._client = NMClient.Client.new();
|
// 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
|
||||||
|
|
||||||
|
// Virtual device types
|
||||||
|
this._vtypes = { };
|
||||||
|
if (NMGtk) {
|
||||||
|
this._vtypes[NetworkManager.SETTING_VLAN_SETTING_NAME] = NMDeviceVirtual;
|
||||||
|
this._vtypes[NetworkManager.SETTING_BOND_SETTING_NAME] = NMDeviceVirtual;
|
||||||
|
this._vtypes[NetworkManager.SETTING_BRIDGE_SETTING_NAME] = NMDeviceVirtual;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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;
|
||||||
|
if (NMGtk) {
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
this._ctypes[NetworkManager.SETTING_VPN_SETTING_NAME] = NMConnectionCategory.VPN;
|
||||||
|
|
||||||
|
NMClient.Client.new_async(null, Lang.bind(this, this._clientGot));
|
||||||
|
NMClient.RemoteSettings.new_async(null, null, Lang.bind(this, this._remoteSettingsGot));
|
||||||
|
},
|
||||||
|
|
||||||
|
_clientGot: function(obj, result) {
|
||||||
|
this._client = NMClient.Client.new_finish(result);
|
||||||
|
|
||||||
|
this._tryLateInit();
|
||||||
|
},
|
||||||
|
|
||||||
|
_remoteSettingsGot: function(obj, result) {
|
||||||
|
this._settings = NMClient.RemoteSettings.new_finish(result);
|
||||||
|
|
||||||
|
this._tryLateInit();
|
||||||
|
},
|
||||||
|
|
||||||
|
_tryLateInit: function() {
|
||||||
|
if (!this._client || !this._settings)
|
||||||
|
return;
|
||||||
|
|
||||||
this._statusSection = new PopupMenu.PopupMenuSection();
|
this._statusSection = new PopupMenu.PopupMenuSection();
|
||||||
this._statusItem = new PopupMenu.PopupMenuItem('', { reactive: false });
|
this._statusItem = new PopupMenu.PopupMenuItem('', { reactive: false });
|
||||||
@ -1737,59 +1789,17 @@ const NMApplet = new Lang.Class({
|
|||||||
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
|
this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
|
||||||
this.menu.addSettingsAction(_("Network Settings"), 'gnome-network-panel.desktop');
|
this.menu.addSettingsAction(_("Network Settings"), 'gnome-network-panel.desktop');
|
||||||
|
|
||||||
// Device types
|
this._readConnections();
|
||||||
this._dtypes = { };
|
this._readDevices();
|
||||||
this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
|
this._syncNMState();
|
||||||
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
|
|
||||||
|
|
||||||
// Virtual device types
|
this._client.connect('notify::manager-running', Lang.bind(this, this._syncNMState));
|
||||||
this._vtypes = { };
|
this._client.connect('notify::networking-enabled', Lang.bind(this, this._syncNMState));
|
||||||
if (NMGtk) {
|
this._client.connect('notify::state', Lang.bind(this, this._syncNMState));
|
||||||
this._vtypes[NetworkManager.SETTING_VLAN_SETTING_NAME] = NMDeviceVirtual;
|
this._client.connect('notify::active-connections', Lang.bind(this, this._updateIcon));
|
||||||
this._vtypes[NetworkManager.SETTING_BOND_SETTING_NAME] = NMDeviceVirtual;
|
this._client.connect('device-added', Lang.bind(this, this._deviceAdded));
|
||||||
this._vtypes[NetworkManager.SETTING_BRIDGE_SETTING_NAME] = NMDeviceVirtual;
|
this._client.connect('device-removed', Lang.bind(this, this._deviceRemoved));
|
||||||
}
|
this._settings.connect('new-connection', Lang.bind(this, this._newConnection));
|
||||||
|
|
||||||
// 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;
|
|
||||||
if (NMGtk) {
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
this._ctypes[NetworkManager.SETTING_VPN_SETTING_NAME] = NMConnectionCategory.VPN;
|
|
||||||
|
|
||||||
this._settings = NMClient.RemoteSettings.new(null);
|
|
||||||
this._connectionsReadId = this._settings.connect('connections-read', Lang.bind(this, function() {
|
|
||||||
this._readConnections();
|
|
||||||
this._readDevices();
|
|
||||||
this._syncNMState();
|
|
||||||
|
|
||||||
// Connect to signals late so that early signals don't find in inconsistent state
|
|
||||||
// and connect only once (this signal handler can be called again if NetworkManager goes up and down)
|
|
||||||
if (!this._inited) {
|
|
||||||
this._inited = true;
|
|
||||||
this._client.connect('notify::manager-running', Lang.bind(this, this._syncNMState));
|
|
||||||
this._client.connect('notify::networking-enabled', Lang.bind(this, this._syncNMState));
|
|
||||||
this._client.connect('notify::state', Lang.bind(this, this._syncNMState));
|
|
||||||
this._client.connect('notify::active-connections', Lang.bind(this, this._updateIcon));
|
|
||||||
this._client.connect('device-added', Lang.bind(this, this._deviceAdded));
|
|
||||||
this._client.connect('device-removed', Lang.bind(this, this._deviceRemoved));
|
|
||||||
this._settings.connect('new-connection', Lang.bind(this, this._newConnection));
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
},
|
},
|
||||||
|
|
||||||
_ensureSource: function() {
|
_ensureSource: function() {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user