From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PxhzQ-0003Dw-DQ for garchives@archives.gentoo.org; Thu, 10 Mar 2011 15:41:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF9481C00A; Thu, 10 Mar 2011 15:41:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 169741C009 for ; Thu, 10 Mar 2011 15:41:07 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5AC721B4071 for ; Thu, 10 Mar 2011 15:41:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id B24418006E for ; Thu, 10 Mar 2011 15:41:05 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <3abc7ceb725f2eb28fbda1681f0c905c51587ae2.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-shell/files/gnome-shell-experimental-nm-applet-1.2.patch gnome-base/gnome-shell/files/gnome-shell-experimental-nm-applet-1.3.patch gnome-base/gnome-shell/gnome-shell-2.91.91.ebuild gnome-base/gnome-shell/gnome-shell-9999.ebuild X-VCS-Directories: gnome-base/gnome-shell/ gnome-base/gnome-shell/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 3abc7ceb725f2eb28fbda1681f0c905c51587ae2 Date: Thu, 10 Mar 2011 15:41:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e09fc09a85c012f97aeb1c4f2c1aebc0 commit: 3abc7ceb725f2eb28fbda1681f0c905c51587ae2 Author: Nirbheek Chauhan gentoo org> AuthorDate: Thu Mar 10 14:18:03 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Thu Mar 10 14:18:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D3abc7ceb gnome-base/gnome-shell: update nm-applet patch --- ...> gnome-shell-experimental-nm-applet-1.3.patch} | 167 +++++++++++++-= ----- gnome-base/gnome-shell/gnome-shell-2.91.91.ebuild | 4 +- gnome-base/gnome-shell/gnome-shell-9999.ebuild | 12 +- 3 files changed, 122 insertions(+), 61 deletions(-) diff --git a/gnome-base/gnome-shell/files/gnome-shell-experimental-nm-app= let-1.2.patch b/gnome-base/gnome-shell/files/gnome-shell-experimental-nm-= applet-1.3.patch similarity index 93% rename from gnome-base/gnome-shell/files/gnome-shell-experimental-nm-appl= et-1.2.patch rename to gnome-base/gnome-shell/files/gnome-shell-experimental-nm-applet= -1.3.patch index a1af852..34190c3 100644 --- a/gnome-base/gnome-shell/files/gnome-shell-experimental-nm-applet-1.2= .patch +++ b/gnome-base/gnome-shell/files/gnome-shell-experimental-nm-applet-1.3= .patch @@ -1,4 +1,4 @@ -From 9fb864ff75921974ad1f09ae75dcd6cc94ac90ef Mon Sep 17 00:00:00 2001 +From a4a93f5d68ea9ce6347125eaaf9640ed98654980 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Tue, 25 Jan 2011 22:08:12 +0100 Subject: [PATCH] Status area: add NetworkManager indicator @@ -14,14 +14,14 @@ https://bugzilla.gnome.org/show_bug.cgi?id=3D621707 js/Makefile.am | 2 + js/misc/modemManager.js | 103 +++ js/ui/panel.js | 3 +- - js/ui/status/network.js | 1780 ++++++++++++++++++++++++++++++++= +++++++ + js/ui/status/network.js | 1841 ++++++++++++++++++++++++++++++++= +++++++ tools/build/gnome-shell.modules | 17 + - 6 files changed, 1912 insertions(+), 1 deletions(-) + 6 files changed, 1973 insertions(+), 1 deletions(-) create mode 100644 js/misc/modemManager.js create mode 100644 js/ui/status/network.js =20 diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css -index c7d875a..78f1361 100644 +index 22670bd..39bb7ab 100644 --- a/data/theme/gnome-shell.css +++ b/data/theme/gnome-shell.css @@ -158,6 +158,14 @@ StTooltip StLabel { @@ -169,10 +169,10 @@ index 0000000..b368511 +}; +Signals.addSignalMethods(ModemCdma.prototype); diff --git a/js/ui/panel.js b/js/ui/panel.js -index d1bf3fd..76c10f1 100644 +index c08c3e8..abe0fe2 100644 --- a/js/ui/panel.js +++ b/js/ui/panel.js -@@ -38,7 +38,8 @@ const STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION =3D { +@@ -41,7 +41,8 @@ const STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION =3D { 'a11y': imports.ui.status.accessibility.ATIndicator, 'volume': imports.ui.status.volume.Indicator, 'battery': imports.ui.status.power.Indicator, @@ -184,14 +184,15 @@ index d1bf3fd..76c10f1 100644 if (Config.HAVE_BLUETOOTH) diff --git a/js/ui/status/network.js b/js/ui/status/network.js new file mode 100644 -index 0000000..ecc80cc +index 0000000..9700896 --- /dev/null +++ b/js/ui/status/network.js -@@ -0,0 +1,1780 @@ +@@ -0,0 +1,1841 @@ +// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*- +const ByteArray =3D imports.byteArray; +const DBus =3D imports.dbus; +const GLib =3D imports.gi.GLib; ++const GObject =3D imports.gi.GObject; +const Lang =3D imports.lang; +const Mainloop =3D imports.mainloop; +const NetworkManager =3D imports.gi.NetworkManager; @@ -300,7 +301,7 @@ index 0000000..ecc80cc + }, + + _updated: function(ap, strength) { -+ if (strength > this._bestAP.strength) ++ if (strength > this.bestAP.strength) + this.bestAP =3D ap; + + this.setIcon(this._getIcon()); @@ -350,8 +351,9 @@ index 0000000..ecc80cc + this.device =3D device; + if (device) { + this.device._delegate =3D this; -+ this.device.connect('state-changed', Lang.bind(this, this.d= eviceStateChanged)); -+ } ++ this._stateChangedId =3D this.device.connect('state-changed= ', Lang.bind(this, this.deviceStateChanged)); ++ } else ++ this._stateChangedId =3D 0; + + // protected + this._client =3D client; @@ -385,6 +387,22 @@ index 0000000..ecc80cc + this._createSection(); + }, + ++ destroy: function() { ++ if (this.device) ++ this.device._delegate =3D null; ++ ++ if (this._stateChangedId) { ++ // Need to go through GObject.Object.prototype because ++ // nm_device_disconnect conflicts with g_signal_disconnect ++ GObject.Object.prototype.disconnect.call(this.device, this.= _stateChangedId); ++ this._stateChangedId =3D 0; ++ } ++ ++ if (this.titleItem) ++ this.titleItem.destroy(); ++ this.section.destroy(); ++ }, ++ + setActiveConnection: function(activeConnection) { + if (activeConnection =3D=3D this._activeConnection) + // nothing to do @@ -577,7 +595,7 @@ index 0000000..ecc80cc + this.client.deactivate_connection(this._activeConnec= tion); + but with this, NM insists in restarting the connecti= on immediately + */ -+ this.device.disconnect(function() { }); ++ this.device.disconnect(null); + })); + } else { + /* TRANSLATORS: this is the indication that a connection fo= r another logged in user is active, @@ -642,9 +660,7 @@ index 0000000..ecc80cc + + if (newstate !=3D NetworkManager.DeviceState.DISCONNECTED && + newstate !=3D NetworkManager.DeviceState.ACTIVATED && -+ oldstate !=3D NetworkManager.DeviceState.DISCONNECTED && -+ oldstate !=3D NetworkManager.DeviceState.ACTIVATED && -+ oldstate !=3D NetworkManager.DeviceState.UNMANAGED) { ++ this._statusItem) { + // a transition between states that show the status label + this._statusItem.label.text =3D this._getStatusLabel(); + return; @@ -720,7 +736,7 @@ index 0000000..ecc80cc + is_wwan =3D true; + this.mobileDevice =3D new ModemManager.ModemCdma(device.udi= ); + this._connectionType =3D NetworkManager.SETTING_CDMA_SETTIN= G_NAME; -+ } else if (this._capabilites & NetworkManager.DeviceModemCapabi= lites.LTE) { ++ } else if (this._capabilites & NetworkManager.DeviceModemCapabi= lities.LTE) { + is_wwan =3D true; + // FIXME: support signal quality + } @@ -734,7 +750,7 @@ index 0000000..ecc80cc + } + + if (this.mobileDevice) { -+ this.mobileDevice.connect('notify::operator-name', Lang.bin= d(this, function() { ++ this._operatorNameId =3D this.mobileDevice.connect('notify:= :operator-name', Lang.bind(this, function() { + if (this._operatorItem) { + let name =3D this.mobileDevice.operator_name; + if (name) { @@ -744,7 +760,7 @@ index 0000000..ecc80cc + this._operatorItem.actor.hide(); + } + })); -+ this.mobileDevice.connect('notify::signal-quality', Lang.bi= nd(this, function() { ++ this._signalQualityId =3D this.mobileDevice.connect('notify= ::signal-quality', Lang.bind(this, function() { + if (this._operatorItem) { + this._operatorItem.setIcon(this._getSignalIcon()); + } @@ -754,6 +770,13 @@ index 0000000..ecc80cc + NMDevice.prototype._init.call(this, client, device, connections= , 1); + }, + ++ destroy: function() { ++ if (this.mobileDevice) ++ this.mobileDevice.disconnectAll(); ++ ++ NMDevice.prototype.destroy.call(this); ++ }, ++ + _getSignalIcon: function() { + return 'network-cellular-signal-' + signalToIcon(this.mobileDev= ice.signal_quality); + }, @@ -913,12 +936,27 @@ index 0000000..ecc80cc + } + } + } -+ device.connect('access-point-added', Lang.bind(this, this._acce= ssPointAdded)); -+ device.connect('access-point-removed', Lang.bind(this, this._ac= cessPointRemoved)); ++ this._apAddedId =3D device.connect('access-point-added', Lang.b= ind(this, this._accessPointAdded)); ++ this._apRemovedId =3D device.connect('access-point-removed', La= ng.bind(this, this._accessPointRemoved)); + + NMDevice.prototype._init.call(this, client, device, validConnec= tions); + }, + ++ destroy: function() { ++ if (this._apAddedId) { ++ // see above for this HACK ++ GObject.Object.prototype.disconnect.call(this.device, this.= _apAddedId); ++ this._apAddedId =3D 0; ++ } ++ ++ if (this._apRemovedId) { ++ GObject.Object.prototype.disconnect.call(this.device, this.= _apRemovedId); ++ this._apRemovedId =3D 0; ++ } ++ ++ NMDevice.prototype.destroy.call(this); ++ }, ++ + _findNetwork: function(ssid) { + for (let i =3D 0; i < this._networks.length; i++) { + if (ssidCompare(this._networks[i].ssid, ssid)) @@ -932,7 +970,7 @@ index 0000000..ecc80cc + let pos =3D this._findNetwork(ssid); + let apObj; + if (pos !=3D -1) { -+ apObj =3D this._network[pos]; ++ apObj =3D this._networks[pos]; + if (apObj.accessPoints.indexOf(accessPoint) !=3D -1) { + log('Access point was already seen, not adding again'); + return; @@ -945,7 +983,7 @@ index 0000000..ecc80cc + item: null, + accessPoints: [ accessPoint ] + }; -+ this._accessPoints.push(apObj); ++ this._networks.push(apObj); + } + + // check if this enables new connections for this group @@ -1182,9 +1220,10 @@ index 0000000..ecc80cc + if (fixedChannel && fixedChannel !=3D NetworkManager.utils_wifi= _freq_to_channel(ap.frequency)) + return false; + -+ if (!wirelessSettings.ap_security_compatible(wirelessSecuritySe= ttings, ap.flags, ap.wpa_flags, ap.rsn_flags, ap.mode)) -+ return false; -+ return true; ++ if (!wirelessSecuritySettings) ++ return true; ++ ++ return wirelessSettings.ap_security_compatible(wirelessSecurity= Settings, ap.flags, ap.wpa_flags, ap.rsn_flags, ap.mode); + }, + + _createActiveConnectionItems: function() { @@ -1201,7 +1240,7 @@ index 0000000..ecc80cc + = { reactive: false }); + this._disconnectItem =3D new PopupMenu.PopupMenuItem(_("Dis= connect")); + this._disconnectItem.connect('activate', Lang.bind(this, fu= nction() { -+ this.device.disconnect(function() { }); ++ this.device.disconnect(null); + })); + } else { + // We cannot read the connection (due to ACL, or API incomp= atibility), but we still show signal if we have it @@ -1267,7 +1306,7 @@ index 0000000..ecc80cc + type: NetworkManager.SETTING_WIRELESS_SETTING_N= AME + })); + -+ accessPoints =3D sortAccessPoints(apObj.accessPoint= s); ++ let accessPoints =3D sortAccessPoints(apObj.accessP= oints); + this._client.add_and_activate_connection(connection= , this.device, accessPoints[0].dbus_path, null) + })); + } @@ -1279,7 +1318,7 @@ index 0000000..ecc80cc + this._overflowItem =3D new PopupMenu.PopupSubMenuMe= nuItem(_("More...")); + this.section.addMenuItem(this._overflowItem); + } -+ this._overflowItem.menu.addMenuItem(menuItem); ++ this._overflowItem.menu.addMenuItem(apObj.item); + } + } + }, @@ -1394,19 +1433,23 @@ index 0000000..ecc80cc + this._ctypes[NetworkManager.SETTING_VPN_SETTING_NAME] =3D NMCon= nectionCategory.VPN; + + this._settings =3D NMClient.RemoteSettings.new(null); -+ this._settings.connect('connections-read', Lang.bind(this, func= tion() { ++ this._connectionsReadId =3D 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 -+ this._client.connect('notify::manager-running', Lang.bind(t= his, this._syncNMState)); -+ this._client.connect('notify::networking-enabled', Lang.bin= d(this, this._syncNMState)); -+ this._client.connect('notify::state', Lang.bind(this, this.= _syncNMState)); -+ this._client.connect('notify::active-connections', Lang.bin= d(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, th= is._newConnection)); ++ // and connect only once (this signal handler can be called= again if NetworkManager goes up and down) ++ if (!this._inited) { ++ this._inited =3D true; ++ this._client.connect('notify::manager-running', Lang.bi= nd(this, this._syncNMState)); ++ this._client.connect('notify::networking-enabled', Lang= .bind(this, this._syncNMState)); ++ this._client.connect('notify::state', Lang.bind(this, t= his._syncNMState)); ++ this._client.connect('notify::active-connections', Lang= .bind(this, this._updateIcon)); ++ this._client.connect('device-added', Lang.bind(this, th= is._deviceAdded)); ++ this._client.connect('device-removed', Lang.bind(this, = this._deviceRemoved)); ++ this._settings.connect('new-connection', Lang.bind(this= , this._newConnection)); ++ } + })); + }, + @@ -1463,19 +1506,26 @@ index 0000000..ecc80cc + }, + + _readDevices: function() { -+ let devices =3D this._client.get_devices(); ++ let devices =3D this._client.get_devices() || [ ]; + for (let i =3D 0; i < devices.length; ++i) { + this._deviceAdded(this._client, devices[i]); + } + }, + + _deviceAdded: function(client, device) { ++ if (device._delegate) { ++ // already seen, not adding again ++ return; ++ } + let wrapperClass =3D this._dtypes[device.get_device_type()]; + if (wrapperClass) { + // XXX: check what nm-applet does here + device._description =3D device.get_product(); + + let wrapper =3D new wrapperClass(this._client, device, this= ._connections); ++ // FIXME: these notifications are duplicate with those expo= sed by nm-applet ++ // uncomment this code in 3.2, when we'll conflict with and= kill nm-applet ++ /* + wrapper._networkLostId =3D wrapper.connect('network-lost', = Lang.bind(this, function() { + this._ensureSource(); + let icon =3D new St.Icon({ icon_name: 'network-offline'= , @@ -1506,7 +1556,7 @@ index 0000000..ecc80cc + wrapper._destroyId =3D wrapper.connect('destroy', function(= wrapper) { + wrapper.disconnect(wrapper._networkLostId); + wrapper.disconnect(wrapper._activationFailedId); -+ }); ++ }); */ + let section =3D this['_' + wrapper.category + 'Section']; + let devices =3D this['_' + wrapper.category + 'Devices']; + @@ -1527,13 +1577,12 @@ index 0000000..ecc80cc + + _deviceRemoved: function(client, device) { + if (!device._delegate) { -+ log('Removing a network device that was not added (race con= dition?)'); ++ log('Removing a network device that was not added'); + return; + } + + let wrapper =3D device._delegate; -+ wrapper.titleItem.destroy(); -+ wrapper.section.destroy(); ++ wrapper.destroy(); + + let section =3D this['_' + wrapper.category + 'Section']; + let devices =3D this['_' + wrapper.category + 'Devices']; @@ -1652,6 +1701,10 @@ index 0000000..ecc80cc + }, + + _notifyActiveConnection: function(active) { ++ // FIXME: duplicate notifications when nm-applet is running ++ // This code will come back when nm-applet is killed ++ return; ++ + if (active.state =3D=3D NetworkManager.ActiveConnectionState.AC= TIVATED) { + + // notify only connections that are visible @@ -1708,11 +1761,11 @@ index 0000000..ecc80cc + for (let i =3D 0; i < connections.length; i++) { + let connection =3D connections[i]; + if (connection._uuid) { -+ log('Connection was already seen, when reading the conn= ections for the first time (race condition?)'); ++ // connection was already seen (for example because Net= workManager was restarted) + continue; + } -+ connection.connect('removed', Lang.bind(this, this._connect= ionRemoved)); -+ connection.connect('updated', Lang.bind(this, this._updateC= onnection)); ++ connection._removedId =3D connection.connect('removed', Lan= g.bind(this, this._connectionRemoved)); ++ connection._updatedId =3D connection.connect('updated', Lan= g.bind(this, this._updateConnection)); + + this._updateConnection(connection); + this._connections.push(connection); @@ -1721,12 +1774,12 @@ index 0000000..ecc80cc + + _newConnection: function(settings, connection) { + if (connection._uuid) { -+ log('Connection was already seen, not adding again...'); ++ // connection was already seen + return; + } + -+ connection.connect('removed', Lang.bind(this, this._connectionR= emoved)); -+ connection.connect('updated', Lang.bind(this, this._updateConne= ction)); ++ connection._removedId =3D connection.connect('removed', Lang.bi= nd(this, this._connectionRemoved)); ++ connection._updatedId =3D connection.connect('updated', Lang.bi= nd(this, this._updateConnection)); + + this._updateConnection(connection); + this._connections.push(connection); @@ -1739,9 +1792,15 @@ index 0000000..ecc80cc + if (pos !=3D -1) + this._connections.splice(connection); + -+ if (!connection._everAdded) -+ return; ++ connection._uuid =3D null; ++ connection.disconnect(connection._removedId); ++ connection.disconnect(connection._updatedId); ++ ++ if (connection._everAdded) ++ this._hideConnection(connection); ++ }, + ++ _hideConnection: function(connection) { + let section =3D connection._section; + if (section =3D=3D NMConnectionCategory.VPN) { + this._vpnDevice.removeConnection(connection); @@ -1752,10 +1811,12 @@ index 0000000..ecc80cc + for (let i =3D 0; i < devices.length; i++) + devices[i].removeConnection(connection); + } ++ connection._everAdded =3D false; + }, + + _updateConnection: function(connection) { -+ this._connectionRemoved(connection); ++ if (connection._everAdded) ++ this._hideConnection(connection); + + let connectionSettings =3D connection.get_setting_by_name(Netwo= rkManager.SETTING_CONNECTION_SETTING_NAME); + connection._type =3D connectionSettings.type; @@ -1969,7 +2030,7 @@ index 0000000..ecc80cc + } +}; diff --git a/tools/build/gnome-shell.modules b/tools/build/gnome-shell.m= odules -index 778db20..6ad230d 100644 +index 3f51fa2..73332b8 100644 --- a/tools/build/gnome-shell.modules +++ b/tools/build/gnome-shell.modules @@ -9,6 +9,8 @@ @@ -1981,7 +2042,7 @@ index 778db20..6ad230d 100644 =20 @@ -2002,4 +2063,4 @@ index 778db20..6ad230d 100644 + --=20 -1.7.4 +1.7.4 \ No newline at end of file diff --git a/gnome-base/gnome-shell/gnome-shell-2.91.91.ebuild b/gnome-ba= se/gnome-shell/gnome-shell-2.91.91.ebuild index f1ad0a0..4a3c9cf 100644 --- a/gnome-base/gnome-shell/gnome-shell-2.91.91.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-2.91.91.ebuild @@ -31,7 +31,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9 >=3Dx11-libs/gtk+-3.0.0:3[introspection] >=3Dmedia-libs/clutter-1.5.15[introspection] >=3Dgnome-base/gnome-desktop-2.91.2:3 - >=3Dgnome-base/gsettings-desktop-schemas-0.1.7.1 + >=3Dgnome-base/gsettings-desktop-schemas-2.91.91 >=3Dgnome-extra/evolution-data-server-2.91.6 >=3Dmedia-libs/gstreamer-0.10.16 >=3Dmedia-libs/gst-plugins-base-0.10.16 @@ -65,7 +65,7 @@ RDEPEND=3D"${COMMON_DEPEND} >=3Dgnome-base/dconf-0.4.1 >=3Dgnome-base/libgnomekbd-2.91.4[introspection] sys-power/upower[introspection] -=09 + >=3Dgnome-base/gnome-session-2.91.91 =20 >=3Dgnome-base/gnome-settings-daemon-2.91 diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/= gnome-shell/gnome-shell-9999.ebuild index 5708018..f44e67b 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -32,7 +32,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9 >=3Dx11-libs/gtk+-3.0.0:3[introspection] >=3Dmedia-libs/clutter-1.5.15[introspection] >=3Dgnome-base/gnome-desktop-2.91.2:3 - >=3Dgnome-base/gsettings-desktop-schemas-0.1.7.1 + >=3Dgnome-base/gsettings-desktop-schemas-2.91.91 >=3Dgnome-extra/evolution-data-server-2.91.6 >=3Dmedia-libs/gstreamer-0.10.16 >=3Dmedia-libs/gst-plugins-base-0.10.16 @@ -55,8 +55,8 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9 x11-libs/startup-notification x11-libs/libXfixes x11-apps/mesa-progs -=09 - nm-applet? ( >=3Dnet-misc/networkmanager-9999[introspection] )" + + nm-applet? ( >=3Dnet-misc/networkmanager-0.8.996[introspection] )" # Runtime-only deps are probably incomplete and approximate. # Each block: # 1. Introspection stuff + dconf needed via imports.gi.* @@ -68,13 +68,13 @@ RDEPEND=3D"${COMMON_DEPEND} >=3Dgnome-base/dconf-0.4.1 >=3Dgnome-base/libgnomekbd-2.91.4[introspection] sys-power/upower[introspection] -=09 + >=3Dgnome-base/gnome-session-2.91.91 =20 >=3Dgnome-base/gnome-settings-daemon-2.91 >=3Dgnome-base/gnome-control-center-2.91 =20 - nm-applet? ( >=3Dgnome-extra/nm-applet-9999 )" + nm-applet? ( >=3Dgnome-extra/nm-applet-0.8.996 )" DEPEND=3D"${COMMON_DEPEND} sys-devel/gettext >=3Ddev-util/pkgconfig-0.22 @@ -92,7 +92,7 @@ src_prepare() { ewarn "Adding support for the experimental NetworkManager applet." ewarn "This needs the latest NetworkManager & nm-applet trunk." ewarn "Report bugs about this to 'nirbheek' on #gentoo-desktop @ FreeN= ode." - epatch "${FILESDIR}/${PN}-experimental-nm-applet-1.2.patch" + epatch "${FILESDIR}/${PN}-experimental-nm-applet-1.3.patch" fi =20 epatch "${FILESDIR}/${PN}-fix-gnome-bluetooth.patch"