[gnome-shell] NetworkMenu: don't pass NULL to nm_utils_ssid_to_utf8
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] NetworkMenu: don't pass NULL to nm_utils_ssid_to_utf8
- Date: Mon, 11 Apr 2011 14:44:55 +0000 (UTC)
commit 6a27d5ed804c6310478710301a83ec161d25d509
Author: Giovanni Campagna <gcampagna src gnome org>
Date: Thu Apr 7 19:13:28 2011 +0200
NetworkMenu: don't pass NULL to nm_utils_ssid_to_utf8
It expects an Array or a ByteArray, and gjs throws in that case.
https://bugzilla.gnome.org/show_bug.cgi?id=647040
js/ui/status/network.js | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index a5b8a14..48a7a16 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -101,8 +101,13 @@ NMNetworkMenuItem.prototype = {
accessPoints = sortAccessPoints(accessPoints);
this.bestAP = accessPoints[0];
- let ssid = this.bestAP.get_ssid();
- title = title || NetworkManager.utils_ssid_to_utf8(ssid) || _("<unknown>");
+ if (!title) {
+ let ssid = this.bestAP.get_ssid();
+ if (ssid)
+ title = NetworkManager.utils_ssid_to_utf8(ssid);
+ if (!title)
+ title = _("<unknown>");
+ }
this._label = new St.Label({ text: title });
this.addActor(this._label);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]