From 054f49820183befaafc6544ba650b235fb3ed44a Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Mon, 20 Dec 2010 17:58:12 +0100 Subject: [PATCH] BluetoothStatus: hide the additional separator if no devices are shown Sometimes devices are reported by BluetoothApplet, but are not shown, so we should not count them to decide whether to show the device separator. --- js/ui/status/bluetooth.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js index ead3b1f88..bde3f46cf 100644 --- a/js/ui/status/bluetooth.js +++ b/js/ui/status/bluetooth.js @@ -124,18 +124,20 @@ Indicator.prototype = { this._deviceItems = []; let devices = this._applet.get_devices(); - if (devices.length == 0) - this._deviceSep.actor.hide(); - else - this._deviceSep.actor.show(); + let anydevice = false; for (let i = 0; i < devices.length; i++) { let d = devices[i]; let item = this._createDeviceItem(d); if (item) { this.menu.addMenuItem(item, this._deviceItemPosition + this._deviceItems.length); this._deviceItems.push(item); + anydevice = true; } } + if (anydevice) + this._deviceSep.actor.show(); + else + this._deviceSep.actor.hide(); }, _createDeviceItem: function(device) {