From: "Nirbheek Chauhan" <nirbheek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/
Date: Mon, 28 Feb 2011 20:25:18 +0000 (UTC) [thread overview]
Message-ID: <144f8928be9bc1283eaca0e190da45f8ead1cddd.nirbheek@gentoo> (raw)
commit: 144f8928be9bc1283eaca0e190da45f8ead1cddd
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 20:18:46 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 20:18:46 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=144f8928
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-applet-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-applet-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 <gcampagna@src.gnome.org>
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=621707
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
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;
}
@@ -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 = \
@@ -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 = \
+@@ -50,6 +51,7 @@ nobase_dist_js_DATA = \
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 = {
@@ -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 = imports.byteArray;
+const DBus = imports.dbus;
@@ -282,7 +282,7 @@ index 0000000..04e9c87
+ this.bestAP = accessPoints[0];
+
+ let ssid = this.bestAP.get_ssid();
-+ title = title || NetworkManager.utils_ssid_to_utf8(ssid, ssid.length) || _("<unknown>");
++ title = title || NetworkManager.utils_ssid_to_utf8(ssid) || _("<unknown>");
+
+ 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 = {
++NMDeviceModem.prototype = {
+ __proto__: NMDevice.prototype,
+
+ _init: function(client, device, connections) {
-+ this._autoConnectionName = _("New Mobile Broadband connection...");
-+ this.category = NMConnectionCategory.WWAN;
++ let is_wwan = false;
++
++ this.mobileDevice = null;
++ this._connecitonType = 'ppp';
+
-+ if (device instanceof NMClient.GsmDevice) {
++ // FIXME: listen for this property changing and recreate modem stuff
++ this._capabilities = device.current_capabilites;
++ 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 (device instanceof NMClient.CdmaDevice) {
++ } 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._capabilites & NetworkManager.DeviceModemCapabilites.LTE) {
++ is_wwan = true;
++ // FIXME: support signal quality
+ }
+
-+ this.mobileDevice.connect('notify::operator-name', Lang.bind(this, function() {
-+ if (this._operatorItem) {
-+ let name = this.mobileDevice.operator_name;
-+ if (name) {
-+ this._operatorItem.label.text = name;
-+ this._operatorItem.actor.show();
-+ } else
-+ this._operatorItem.actor.hide();
-+ }
-+ }));
-+ this.mobileDevice.connect('notify::signal-quality', Lang.bind(this, function() {
-+ if (this._operatorItem) {
-+ this._operatorItem.setIcon(this._getSignalIcon());
-+ }
-+ }));
++ if (is_wwan) {
++ this.category = NMConnectionCategory.WWAN;
++ this._autoConnectionName = _("New Mobile Broadband connection...");
++ } else {
++ this.category = NMConnectionCategory.WIRED;
++ this._autoConnectionName = _("Auto dial-up");
++ }
++
++ if (this.mobileDevice) {
++ this.mobileDevice.connect('notify::operator-name', Lang.bind(this, function() {
++ if (this._operatorItem) {
++ let name = this.mobileDevice.operator_name;
++ if (name) {
++ this._operatorItem.label.text = name;
++ this._operatorItem.actor.show();
++ } else
++ this._operatorItem.actor.hide();
++ }
++ }));
++ this.mobileDevice.connect('notify::signal-quality', Lang.bind(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 = new PopupMenu.PopupImageMenuItem(this.mobileDevice.operator_name || '',
++ this._getSignalIcon(),
++ { reactive: false });
++ this.section.addMenuItem(this._operatorItem);
++ }
+
-+ this._operatorItem = new PopupMenu.PopupImageMenuItem(this.mobileDevice.operator_name || '',
-+ this._getSignalIcon(),
-+ { reactive: 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 = new NetworkManager.Connection;
+ connection._uuid = NetworkManager.utils_uuid_generate();
@@ -1218,7 +1240,7 @@ index 0000000..04e9c87
+ if (apObj.connections.length == 1)
+ apObj.item = this._createAPItem(apObj.connections[0], apObj, false);
+ else {
-+ let title = NetworkManager.utils_ssid_to_utf8(apObj.ssid, apObj.ssid.length) || _("<unknown>");
++ let title = NetworkManager.utils_ssid_to_utf8(apObj.ssid) || _("<unknown>");
+ apObj.item = new PopupMenu.PopupSubMenuMenuItem(title);
+ apObj.item._apObj = apObj;
+ for (let i = 0; i < apObj.connections.length; i++)
@@ -1229,7 +1251,7 @@ index 0000000..04e9c87
+ apObj.item._apObj = apObj;
+ apObj.item.connect('activate', Lang.bind(this, function() {
+ let name;
-+ let ssid = NetworkManager.utils_ssid_to_utf8(apObj.ssid, apObj.ssid.length);
++ let ssid = NetworkManager.utils_ssid_to_utf8(apObj.ssid);
+ if (ssid) {
+ /* TRANSLATORS: this the automatic wireless connection name (including the network name) */
+ name = _("Auto %s").format(ssid);
@@ -1356,16 +1378,16 @@ index 0000000..04e9c87
+ this._dtypes = { };
+ this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
+ this._dtypes[NetworkManager.DeviceType.WIFI] = NMDeviceWireless;
-+ this._dtypes[NetworkManager.DeviceType.GSM] = NMDeviceWWAN;
-+ this._dtypes[NetworkManager.DeviceType.CDMA] = NMDeviceWWAN;
++ this._dtypes[NetworkManager.DeviceType.MODEM] = NMDeviceModem;
+ this._dtypes[NetworkManager.DeviceType.BT] = NMDeviceBluetooth;
-+ // FIXME: WWAN support (if enabled)
++ // FIXME: WiMax support (if enabled)
+
+ // 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;
@@ -1631,42 +1653,46 @@ index 0000000..04e9c87
+
+ _notifyActiveConnection: function(active) {
+ if (active.state == NetworkManager.ActiveConnectionState.ACTIVATED) {
-+ this._ensureSource();
+
-+ let icon;
-+ let banner;
-+ switch (active._section) {
-+ case NMConnectionCategory.WWAN:
-+ icon = 'network-cellular-signal-excellent';
-+ banner = _("You're now connected to mobile broadband connection '%s'").format(active._connection._name);
-+ break;
-+ case NMConnectionCategory.WIRELESS:
-+ icon = 'network-wireless-signal-excellent';
-+ banner = _("You're now connected to wireless network '%s'").format(active._connection._name);
-+ break;
-+ case NMConnectionCategory.WIRED:
-+ icon = 'network-wired';
-+ banner = _("You're now connected to wired network '%s'").format(active._connection._name);
-+ break;
-+ case NMConnectionCategory.VPN:
-+ icon = 'network-vpn';
-+ banner = _("You're now connected to VPN network '%s'").format(active._connection._name);
-+ break;
-+ default:
-+ // a fallback for a generic 'connected' icon
-+ icon = 'network-transmit-receive';
-+ banner = _("You're now connected to '%s'").format(active._connection._name);
-+ }
++ // notify only connections that are visible
++ if (active._connection) {
++ this._ensureSource();
+
-+ let iconActor = new St.Icon({ icon_name: icon,
-+ icon_type: St.IconType.SYMBOLIC,
-+ icon_size: this._source.ICON_SIZE
-+ });
-+ let notification = new MessageTray.Notification(this._source,
-+ _("Connection estabilished"),
-+ banner,
-+ { icon: iconActor });
-+ this._source.notify(notification);
++ let icon;
++ let banner;
++ switch (active._section) {
++ case NMConnectionCategory.WWAN:
++ icon = 'network-cellular-signal-excellent';
++ banner = _("You're now connected to mobile broadband connection '%s'").format(active._connection._name);
++ break;
++ case NMConnectionCategory.WIRELESS:
++ icon = 'network-wireless-signal-excellent';
++ banner = _("You're now connected to wireless network '%s'").format(active._connection._name);
++ break;
++ case NMConnectionCategory.WIRED:
++ icon = 'network-wired';
++ banner = _("You're now connected to wired network '%s'").format(active._connection._name);
++ break;
++ case NMConnectionCategory.VPN:
++ icon = 'network-vpn';
++ banner = _("You're now connected to VPN network '%s'").format(active._connection._name);
++ break;
++ default:
++ // a fallback for a generic 'connected' icon
++ icon = 'network-transmit-receive';
++ banner = _("You're now connected to '%s'").format(active._connection._name);
++ }
++
++ let iconActor = new St.Icon({ icon_name: icon,
++ icon_type: St.IconType.SYMBOLIC,
++ icon_size: this._source.ICON_SIZE
++ });
++ let notification = new MessageTray.Notification(this._source,
++ _("Connection 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.modules
-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
<repository type="tarball" name="cairo.org"
href="http://cairographics.org/"/>
<repository type="tarball" name="0pointer.de"
-@@ -315,4 +317,19 @@
+@@ -329,4 +331,19 @@
</dependencies>
</autotools>
diff --git a/gnome-base/gnome-shell/gnome-shell-2.91.90.ebuild b/gnome-base/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 >=media-libs/gst-plugins-good-0.10.23"
ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change"
- 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
# 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=">=dev-libs/glib-2.25.9
>=dev-libs/gjs-0.7.11
>=dev-libs/gobject-introspection-0.10.1
@@ -38,7 +39,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9
>=net-libs/telepathy-glib-0.13.12[introspection]
>=net-wireless/gnome-bluetooth-2.90.0[introspection]
>=sys-auth/polkit-0.100[introspection]
- >=x11-wm/mutter-2.91.90[introspection]
+ >=x11-wm/mutter-2.91.90.1[introspection]
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 @ FreeNode."
- epatch "${FILESDIR}/${PN}-experimental-nm-applet-1.0.patch"
+ epatch "${FILESDIR}/${PN}-experimental-nm-applet-1.1.patch"
fi
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 >=media-libs/gst-plugins-good-0.10.23"
ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change"
- 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
}
next reply other threads:[~2011-02-28 20:25 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-28 20:25 Nirbheek Chauhan [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-09-10 21:33 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/ Gilles Dartiguelongue
2018-02-03 20:32 Sobhan Mohammadpour
2014-12-21 13:28 Gilles Dartiguelongue
2014-11-29 16:49 Remi Cardona
2014-04-15 22:05 Gilles Dartiguelongue
2013-12-10 23:31 Gilles Dartiguelongue
2012-10-02 1:51 Alexandre Rostovtsev
2012-08-18 15:41 Priit Laes
2012-05-21 6:49 Alexandre Restovtsev
2012-04-06 18:22 Alexandre Restovtsev
2012-04-03 6:36 Alexandre Restovtsev
2011-11-02 2:36 Nirbheek Chauhan
2011-10-18 7:37 Alexandre Restovtsev
2011-08-27 2:08 Alexandre Restovtsev
2011-06-02 14:43 Nirbheek Chauhan
2011-03-29 8:36 Nirbheek Chauhan
2011-03-23 5:20 Nirbheek Chauhan
2011-03-15 13:08 Nirbheek Chauhan
2011-03-13 20:44 Nirbheek Chauhan
2011-03-10 15:41 Nirbheek Chauhan
2011-03-09 11:34 Nirbheek Chauhan
2011-03-04 10:23 Nirbheek Chauhan
2011-02-22 19:44 Nirbheek Chauhan
2011-02-18 6:10 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=144f8928be9bc1283eaca0e190da45f8ead1cddd.nirbheek@gentoo \
--to=nirbheek@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox