diff --git a/data/dbus-interfaces/org.gnome.Shell.xml b/data/dbus-interfaces/org.gnome.Shell.xml index 1fef302b3..094c29444 100644 --- a/data/dbus-interfaces/org.gnome.Shell.xml +++ b/data/dbus-interfaces/org.gnome.Shell.xml @@ -9,9 +9,6 @@ - - - diff --git a/js/ui/osdMonitorLabeler.js b/js/ui/osdMonitorLabeler.js index 55b4d3c21..62feacede 100644 --- a/js/ui/osdMonitorLabeler.js +++ b/js/ui/osdMonitorLabeler.js @@ -95,28 +95,6 @@ var OsdMonitorLabeler = class { this._reset(); - for (let id in params) { - let monitor = this._monitorManager.get_monitor_for_output(id); - if (monitor == -1) - continue; - this._monitorLabels.get(monitor).push(params[id].deep_unpack()); - } - - // In mirrored display setups, more than one physical outputs - // might be showing the same logical monitor. In that case, we - // join each output's labels on the same OSD widget. - for (let [monitor, labels] of this._monitorLabels.entries()) { - labels.sort(); - this._osdLabels.push(new OsdMonitorLabel(monitor, labels.join(' '))); - } - } - - show2(client, params) { - if (!this._trackClient(client)) - return; - - this._reset(); - for (let connector in params) { let monitor = this._monitorManager.get_monitor_for_connector(connector); if (monitor == -1) diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js index 469a6c706..b1f2be2b3 100644 --- a/js/ui/shellDBus.js +++ b/js/ui/shellDBus.js @@ -203,16 +203,10 @@ var GnomeShell = class { this._grabbers.delete(name); } - ShowMonitorLabelsAsync(params, invocation) { - let sender = invocation.get_sender(); - let [dict] = params; - Main.osdMonitorLabeler.show(sender, dict); - } - ShowMonitorLabels2Async(params, invocation) { let sender = invocation.get_sender(); let [dict] = params; - Main.osdMonitorLabeler.show2(sender, dict); + Main.osdMonitorLabeler.show(sender, dict); } HideMonitorLabelsAsync(params, invocation) {