[gnome-shell/benzea/rename-show-monitor-labels: 2/2] shellDBus: Rename ShowMonitorLabels2 to ShowMonitorLabels

[Benjamin Berg <bberg src gnome org>]

commit 0d655a00f84b2c2d68c3bb27c339707a211d0708
Author: Benjamin Berg <bberg redhat com>
Date:   Thu Apr 11 19:43:35 2019 +0200

    shellDBus: Rename ShowMonitorLabels2 to ShowMonitorLabels
    
    The original ShowMonitorLabels has been removed so we can change things
    back to use ShowMonitorLabels again.
    
    https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/491

 data/dbus-interfaces/org.gnome.Shell.xml | 2 +-
 js/ui/shellDBus.js                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/data/dbus-interfaces/org.gnome.Shell.xml b/data/dbus-interfaces/org.gnome.Shell.xml
index 094c29444..38154cbdb 100644
--- a/data/dbus-interfaces/org.gnome.Shell.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.xml
@@ -9,7 +9,7 @@
     <method name="ShowOSD">
       <arg type="a{sv}" direction="in" name="params"/>
     </method>
-    <method name="ShowMonitorLabels2">
+    <method name="ShowMonitorLabels">
       <arg type="a{sv}" direction="in" name="params"/>
     </method>
     <method name="HideMonitorLabels"/>
diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index b1f2be2b3..9411dc5ee 100644
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -203,7 +203,7 @@ var GnomeShell = class {
         this._grabbers.delete(name);
     }
 
-    ShowMonitorLabels2Async(params, invocation) {
+    ShowMonitorLabelsAsync(params, invocation) {
         let sender = invocation.get_sender();
         let [dict] = params;
         Main.osdMonitorLabeler.show(sender, dict);