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 1Pu9ep-0002fa-H9 for garchives@archives.gentoo.org; Mon, 28 Feb 2011 20:25:27 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D24111C029; Mon, 28 Feb 2011 20:25:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 819501C029 for ; Mon, 28 Feb 2011 20:25:20 +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 E3F011B4007 for ; Mon, 28 Feb 2011 20:25:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A982B80073 for ; Mon, 28 Feb 2011 20:25:18 +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: <144f8928be9bc1283eaca0e190da45f8ead1cddd.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.0.patch gnome-base/gnome-shell/files/gnome-shell-experimental-nm-applet-1.1.patch gnome-base/gnome-shell/gnome-shell-2.91.90.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: 144f8928be9bc1283eaca0e190da45f8ead1cddd Date: Mon, 28 Feb 2011 20:25:18 +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: 6eb5afc68ff4535378de7abfb46c742b commit: 144f8928be9bc1283eaca0e190da45f8ead1cddd Author: Nirbheek Chauhan gentoo org> AuthorDate: Mon Feb 28 20:18:46 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Feb 28 20:18:46 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D144f8928 gnome-base/gnome-shell: update patch and shell recorder elog --- ...> gnome-shell-experimental-nm-applet-1.1.patch} | 182 +++++++++++---= ------ gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild | 2 +- gnome-base/gnome-shell/gnome-shell-9999.ebuild | 7 +- 3 files changed, 109 insertions(+), 82 deletions(-) diff --git a/gnome-base/gnome-shell/files/gnome-shell-experimental-nm-app= let-1.0.patch b/gnome-base/gnome-shell/files/gnome-shell-experimental-nm-= applet-1.1.patch similarity index 93% rename from gnome-base/gnome-shell/files/gnome-shell-experimental-nm-appl= et-1.0.patch rename to gnome-base/gnome-shell/files/gnome-shell-experimental-nm-applet= -1.1.patch index 15a560b..546a539 100644 --- a/gnome-base/gnome-shell/files/gnome-shell-experimental-nm-applet-1.0= .patch +++ b/gnome-base/gnome-shell/files/gnome-shell-experimental-nm-applet-1.1= .patch @@ -1,4 +1,4 @@ -From f8a4fa0646aa4ab620331c0bbcae4334173b614d Mon Sep 17 00:00:00 2001 +From 9fb864ff75921974ad1f09ae75dcd6cc94ac90ef 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,17 +14,17 @@ 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 | 1754 ++++++++++++++++++++++++++++++++= +++++++ + js/ui/status/network.js | 1780 ++++++++++++++++++++++++++++++++= +++++++ tools/build/gnome-shell.modules | 17 + - 6 files changed, 1886 insertions(+), 1 deletions(-) + 6 files changed, 1912 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 1da6619..8f0fb52 100644 +index c7d875a..78f1361 100644 --- a/data/theme/gnome-shell.css +++ b/data/theme/gnome-shell.css -@@ -154,6 +154,14 @@ StTooltip StLabel { +@@ -158,6 +158,14 @@ StTooltip StLabel { spacing: .5em; } =20 @@ -40,7 +40,7 @@ index 1da6619..8f0fb52 100644 icon-size: 1.14em; } diff --git a/js/Makefile.am b/js/Makefile.am -index e4a4145..53f80d4 100644 +index 55bb111..a085bfc 100644 --- a/js/Makefile.am +++ b/js/Makefile.am @@ -8,6 +8,7 @@ nobase_dist_js_DATA =3D \ @@ -51,7 +51,7 @@ index e4a4145..53f80d4 100644 misc/params.js \ misc/util.js \ perf/core.js \ -@@ -49,6 +50,7 @@ nobase_dist_js_DATA =3D \ +@@ -50,6 +51,7 @@ nobase_dist_js_DATA =3D \ ui/statusMenu.js \ ui/status/accessibility.js \ ui/status/keyboard.js \ @@ -169,7 +169,7 @@ index 0000000..b368511 +}; +Signals.addSignalMethods(ModemCdma.prototype); diff --git a/js/ui/panel.js b/js/ui/panel.js -index 1c23ae8..ab7a656 100644 +index d1bf3fd..76c10f1 100644 --- a/js/ui/panel.js +++ b/js/ui/panel.js @@ -38,7 +38,8 @@ const STANDARD_TRAY_ICON_SHELL_IMPLEMENTATION =3D { @@ -184,10 +184,10 @@ index 1c23ae8..ab7a656 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..04e9c87 +index 0000000..ecc80cc --- /dev/null +++ b/js/ui/status/network.js -@@ -0,0 +1,1754 @@ +@@ -0,0 +1,1780 @@ +// -*- mode: js2; indent-tabs-mode: nil; js2-basic-offset: 4 -*- +const ByteArray =3D imports.byteArray; +const DBus =3D imports.dbus; @@ -282,7 +282,7 @@ index 0000000..04e9c87 + this.bestAP =3D accessPoints[0]; + + let ssid =3D this.bestAP.get_ssid(); -+ title =3D title || NetworkManager.utils_ssid_to_utf8(ssid, ssid= .length) || _(""); ++ title =3D title || NetworkManager.utils_ssid_to_utf8(ssid) || _= (""); + + PopupMenu.PopupImageMenuItem.prototype._init.call(this, title, = this._getIcon(), params); + @@ -697,40 +697,59 @@ index 0000000..04e9c87 + } +}; + -+function NMDeviceWWAN() { ++function NMDeviceModem() { + this._init.apply(this, arguments); +} + -+NMDeviceWWAN.prototype =3D { ++NMDeviceModem.prototype =3D { + __proto__: NMDevice.prototype, + + _init: function(client, device, connections) { -+ this._autoConnectionName =3D _("New Mobile Broadband connection= ..."); -+ this.category =3D NMConnectionCategory.WWAN; ++ let is_wwan =3D false; ++ ++ this.mobileDevice =3D null; ++ this._connecitonType =3D 'ppp'; + -+ if (device instanceof NMClient.GsmDevice) { ++ // FIXME: listen for this property changing and recreate modem = stuff ++ this._capabilities =3D device.current_capabilites; ++ if (this._capabilities & NetworkManager.DeviceModemCapabilities= .GSM_UMTS) { ++ is_wwan =3D true; + this.mobileDevice =3D new ModemManager.ModemGsm(device.udi)= ; + this._connectionType =3D NetworkManager.SETTING_GSM_SETTING= _NAME; -+ } else if (device instanceof NMClient.CdmaDevice) { ++ } else if (this._capabilities & NetworkManager.DeviceModemCapab= ilities.CDMA_EVDO) { ++ 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) { ++ is_wwan =3D true; ++ // FIXME: support signal quality + } + -+ this.mobileDevice.connect('notify::operator-name', Lang.bind(th= is, function() { -+ if (this._operatorItem) { -+ let name =3D this.mobileDevice.operator_name; -+ if (name) { -+ this._operatorItem.label.text =3D name; -+ this._operatorItem.actor.show(); -+ } else -+ this._operatorItem.actor.hide(); -+ } -+ })); -+ this.mobileDevice.connect('notify::signal-quality', Lang.bind(t= his, function() { -+ if (this._operatorItem) { -+ this._operatorItem.setIcon(this._getSignalIcon()); -+ } -+ })); ++ if (is_wwan) { ++ this.category =3D NMConnectionCategory.WWAN; ++ this._autoConnectionName =3D _("New Mobile Broadband connec= tion..."); ++ } else { ++ this.category =3D NMConnectionCategory.WIRED; ++ this._autoConnectionName =3D _("Auto dial-up"); ++ } ++ ++ if (this.mobileDevice) { ++ this.mobileDevice.connect('notify::operator-name', Lang.bin= d(this, function() { ++ if (this._operatorItem) { ++ let name =3D this.mobileDevice.operator_name; ++ if (name) { ++ this._operatorItem.label.text =3D name; ++ this._operatorItem.actor.show(); ++ } else ++ this._operatorItem.actor.hide(); ++ } ++ })); ++ this.mobileDevice.connect('notify::signal-quality', Lang.bi= nd(this, function() { ++ if (this._operatorItem) { ++ this._operatorItem.setIcon(this._getSignalIcon()); ++ } ++ })); ++ } + + NMDevice.prototype._init.call(this, client, device, connections= , 1); + }, @@ -740,12 +759,14 @@ index 0000000..04e9c87 + }, + + _createSection: function() { -+ NMDevice.prototype._createSection.call(this); ++ if (this.mobileDevice) { ++ this._operatorItem =3D new PopupMenu.PopupImageMenuItem(thi= s.mobileDevice.operator_name || '', ++ this.= _getSignalIcon(), ++ { rea= ctive: false }); ++ this.section.addMenuItem(this._operatorItem); ++ } + -+ this._operatorItem =3D new PopupMenu.PopupImageMenuItem(this.mo= bileDevice.operator_name || '', -+ this._get= SignalIcon(), -+ { reactiv= e: false }); -+ this.section.addMenuItem(this._operatorItem, 0); ++ NMDevice.prototype._createSection.call(this); + }, + + clearSection: function() { @@ -762,6 +783,7 @@ index 0000000..04e9c87 + // FIXME: we need to summon the mobile wizard here + // or NM will not have the necessary parameters to complete the= connection + // (the same FIXME is currently in nm-applet, actually) ++ // (this does not apply to dial-up) + + let connection =3D new NetworkManager.Connection; + connection._uuid =3D NetworkManager.utils_uuid_generate(); @@ -1218,7 +1240,7 @@ index 0000000..04e9c87 + if (apObj.connections.length =3D=3D 1) + apObj.item =3D this._createAPItem(apObj.connections= [0], apObj, false); + else { -+ let title =3D NetworkManager.utils_ssid_to_utf8(apO= bj.ssid, apObj.ssid.length) || _(""); ++ let title =3D NetworkManager.utils_ssid_to_utf8(apO= bj.ssid) || _(""); + apObj.item =3D new PopupMenu.PopupSubMenuMenuItem(t= itle); + apObj.item._apObj =3D apObj; + for (let i =3D 0; i < apObj.connections.length; i++= ) @@ -1229,7 +1251,7 @@ index 0000000..04e9c87 + apObj.item._apObj =3D apObj; + apObj.item.connect('activate', Lang.bind(this, function= () { + let name; -+ let ssid =3D NetworkManager.utils_ssid_to_utf8(apOb= j.ssid, apObj.ssid.length); ++ let ssid =3D NetworkManager.utils_ssid_to_utf8(apOb= j.ssid); + if (ssid) { + /* TRANSLATORS: this the automatic wireless con= nection name (including the network name) */ + name =3D _("Auto %s").format(ssid); @@ -1356,16 +1378,16 @@ index 0000000..04e9c87 + this._dtypes =3D { }; + this._dtypes[NetworkManager.DeviceType.ETHERNET] =3D NMDeviceWi= red; + this._dtypes[NetworkManager.DeviceType.WIFI] =3D NMDeviceWirele= ss; -+ this._dtypes[NetworkManager.DeviceType.GSM] =3D NMDeviceWWAN; -+ this._dtypes[NetworkManager.DeviceType.CDMA] =3D NMDeviceWWAN; ++ this._dtypes[NetworkManager.DeviceType.MODEM] =3D NMDeviceModem= ; + this._dtypes[NetworkManager.DeviceType.BT] =3D NMDeviceBluetoot= h; -+ // FIXME: WWAN support (if enabled) ++ // FIXME: WiMax support (if enabled) + + // Connection types + this._ctypes =3D { }; + this._ctypes[NetworkManager.SETTING_WIRELESS_SETTING_NAME] =3D = NMConnectionCategory.WIRELESS; + this._ctypes[NetworkManager.SETTING_WIRED_SETTING_NAME] =3D NMC= onnectionCategory.WIRED; + this._ctypes[NetworkManager.SETTING_PPPOE_SETTING_NAME] =3D NMC= onnectionCategory.WIRED; ++ this._ctypes[NetworkManager.SETTING_PPP_SETTING_NAME] =3D NMCon= nectionCategory.WIRED; + this._ctypes[NetworkManager.SETTING_BLUETOOTH_SETTING_NAME] =3D= NMConnectionCategory.WWAN; + this._ctypes[NetworkManager.SETTING_CDMA_SETTING_NAME] =3D NMCo= nnectionCategory.WWAN; + this._ctypes[NetworkManager.SETTING_GSM_SETTING_NAME] =3D NMCon= nectionCategory.WWAN; @@ -1631,42 +1653,46 @@ index 0000000..04e9c87 + + _notifyActiveConnection: function(active) { + if (active.state =3D=3D NetworkManager.ActiveConnectionState.AC= TIVATED) { -+ this._ensureSource(); + -+ let icon; -+ let banner; -+ switch (active._section) { -+ case NMConnectionCategory.WWAN: -+ icon =3D 'network-cellular-signal-excellent'; -+ banner =3D _("You're now connected to mobile broadband = connection '%s'").format(active._connection._name); -+ break; -+ case NMConnectionCategory.WIRELESS: -+ icon =3D 'network-wireless-signal-excellent'; -+ banner =3D _("You're now connected to wireless network = '%s'").format(active._connection._name); -+ break; -+ case NMConnectionCategory.WIRED: -+ icon =3D 'network-wired'; -+ banner =3D _("You're now connected to wired network '%s= '").format(active._connection._name); -+ break; -+ case NMConnectionCategory.VPN: -+ icon =3D 'network-vpn'; -+ banner =3D _("You're now connected to VPN network '%s'"= ).format(active._connection._name); -+ break; -+ default: -+ // a fallback for a generic 'connected' icon -+ icon =3D 'network-transmit-receive'; -+ banner =3D _("You're now connected to '%s'").format(act= ive._connection._name); -+ } ++ // notify only connections that are visible ++ if (active._connection) { ++ this._ensureSource(); + -+ let iconActor =3D new St.Icon({ icon_name: icon, -+ icon_type: St.IconType.SYMBOL= IC, -+ icon_size: this._source.ICON_= SIZE -+ }); -+ let notification =3D new MessageTray.Notification(this._sou= rce, -+ _("Connecti= on estabilished"), -+ banner, -+ { icon: ico= nActor }); -+ this._source.notify(notification); ++ let icon; ++ let banner; ++ switch (active._section) { ++ case NMConnectionCategory.WWAN: ++ icon =3D 'network-cellular-signal-excellent'; ++ banner =3D _("You're now connected to mobile broadb= and connection '%s'").format(active._connection._name); ++ break; ++ case NMConnectionCategory.WIRELESS: ++ icon =3D 'network-wireless-signal-excellent'; ++ banner =3D _("You're now connected to wireless netw= ork '%s'").format(active._connection._name); ++ break; ++ case NMConnectionCategory.WIRED: ++ icon =3D 'network-wired'; ++ banner =3D _("You're now connected to wired network= '%s'").format(active._connection._name); ++ break; ++ case NMConnectionCategory.VPN: ++ icon =3D 'network-vpn'; ++ banner =3D _("You're now connected to VPN network '= %s'").format(active._connection._name); ++ break; ++ default: ++ // a fallback for a generic 'connected' icon ++ icon =3D 'network-transmit-receive'; ++ banner =3D _("You're now connected to '%s'").format= (active._connection._name); ++ } ++ ++ let iconActor =3D new St.Icon({ icon_name: icon, ++ icon_type: St.IconType.SY= MBOLIC, ++ icon_size: this._source.I= CON_SIZE ++ }); ++ let notification =3D new MessageTray.Notification(this.= _source, ++ _("Conn= ection estabilished"), ++ banner, ++ { icon:= iconActor }); ++ this._source.notify(notification); ++ } + + if (active._stateChangeId) { + active.disconnect(active._stateChangeId); @@ -1943,7 +1969,7 @@ index 0000000..04e9c87 + } +}; diff --git a/tools/build/gnome-shell.modules b/tools/build/gnome-shell.m= odules -index e8b5493..2f44c5d 100644 +index 778db20..6ad230d 100644 --- a/tools/build/gnome-shell.modules +++ b/tools/build/gnome-shell.modules @@ -9,6 +9,8 @@ @@ -1955,7 +1981,7 @@ index e8b5493..2f44c5d 100644 =20 diff --git a/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild b/gnome-ba= se/gnome-shell/gnome-shell-2.91.90.ebuild index 19872b0..242e352 100644 --- a/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild @@ -93,6 +93,6 @@ pkg_postinst() { ewarn "To make use of GNOME Shell's built-in screen recording utility,= " ewarn "you need to either install >=3Dmedia-libs/gst-plugins-good-0.10= .23" ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to chang= e" - ewarn "/apps/gnome-shell/recorder/pipeline to what you want to use." + ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." fi } diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/= gnome-shell/gnome-shell-9999.ebuild index 8411da8..399a7ec 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -24,6 +24,7 @@ fi =20 # gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome= -desktop # FIXME: Automagic gnome-bluetooth[introspection] support. +# latest mutter is needed due to commit 474ff2e997 COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9 >=3Ddev-libs/gjs-0.7.11 >=3Ddev-libs/gobject-introspection-0.10.1 @@ -38,7 +39,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9 >=3Dnet-libs/telepathy-glib-0.13.12[introspection] >=3Dnet-wireless/gnome-bluetooth-2.90.0[introspection] >=3Dsys-auth/polkit-0.100[introspection] - >=3Dx11-wm/mutter-2.91.90[introspection] + >=3Dx11-wm/mutter-2.91.90.1[introspection] =20 dev-libs/dbus-glib dev-libs/libxml2:2 @@ -97,7 +98,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.0.patch" + epatch "${FILESDIR}/${PN}-experimental-nm-applet-1.1.patch" fi =20 gnome2_src_prepare @@ -114,6 +115,6 @@ pkg_postinst() { ewarn "To make use of GNOME Shell's built-in screen recording utility,= " ewarn "you need to either install >=3Dmedia-libs/gst-plugins-good-0.10= .23" ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to chang= e" - ewarn "/apps/gnome-shell/recorder/pipeline to what you want to use." + ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." fi }