brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NetworkMenu: don't pass NULL to nm_utils_ssid_to_utf8

Browse Source 
It expects an Array or a ByteArray, and gjs throws in that case.

https://bugzilla.gnome.org/show_bug.cgi?id=647040
This commit is contained in:
Giovanni Campagna 2011-04-07 19:13:28 +02:00 committed by Dan Winship
parent 8232684672
commit 6a27d5ed80
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/ui/status/network.js
View File

@ -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);