[gnome-flashback] shell: rename ShowMonitorLabels2 to ShowMonitorLabels

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 9fb0bcaf4b5ede80cb2440489b4765b9de84db0a
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Jul 15 14:43:49 2019 +0300

    shell: rename ShowMonitorLabels2 to ShowMonitorLabels
    
    https://gitlab.gnome.org/GNOME/gnome-shell/commit/2c8d380e676b17474
    https://gitlab.gnome.org/GNOME/gnome-control-center/commit/3721f9ed

 gnome-flashback/libshell/flashback-monitor-labeler.c | 10 +++++-----
 gnome-flashback/libshell/flashback-monitor-labeler.h | 16 ++++++++--------
 gnome-flashback/libshell/flashback-shell.c           | 20 ++++++++++----------
 gnome-flashback/libshell/org.gnome.Shell.xml         |  2 +-
 4 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/gnome-flashback/libshell/flashback-monitor-labeler.c 
b/gnome-flashback/libshell/flashback-monitor-labeler.c
index 975211f..8300c41 100644
--- a/gnome-flashback/libshell/flashback-monitor-labeler.c
+++ b/gnome-flashback/libshell/flashback-monitor-labeler.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Alberts Muktupāvels
+ * Copyright (C) 2015-2019 Alberts Muktupāvels
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -178,10 +178,10 @@ flashback_monitor_labeler_new (void)
 }
 
 void
-flashback_monitor_labeler_show2 (FlashbackMonitorLabeler *labeler,
-                                 GfMonitorManager        *monitor_manager,
-                                 const gchar             *sender,
-                                 GVariant                *params)
+flashback_monitor_labeler_show (FlashbackMonitorLabeler *labeler,
+                                GfMonitorManager        *monitor_manager,
+                                const gchar             *sender,
+                                GVariant                *params)
 {
   GVariantIter iter;
   const gchar *connector;
diff --git a/gnome-flashback/libshell/flashback-monitor-labeler.h 
b/gnome-flashback/libshell/flashback-monitor-labeler.h
index c876a76..274c2db 100644
--- a/gnome-flashback/libshell/flashback-monitor-labeler.h
+++ b/gnome-flashback/libshell/flashback-monitor-labeler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Alberts Muktupāvels
+ * Copyright (C) 2015-2019 Alberts Muktupāvels
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,15 +26,15 @@ G_BEGIN_DECLS
 G_DECLARE_FINAL_TYPE (FlashbackMonitorLabeler, flashback_monitor_labeler,
                       FLASHBACK, MONITOR_LABELER, GObject)
 
-FlashbackMonitorLabeler *flashback_monitor_labeler_new   (void);
+FlashbackMonitorLabeler *flashback_monitor_labeler_new  (void);
 
-void                     flashback_monitor_labeler_show2 (FlashbackMonitorLabeler *labeler,
-                                                          GfMonitorManager        *monitor_manager,
-                                                          const gchar             *sender,
-                                                          GVariant                *params);
+void                     flashback_monitor_labeler_show (FlashbackMonitorLabeler *labeler,
+                                                         GfMonitorManager        *monitor_manager,
+                                                         const gchar             *sender,
+                                                         GVariant                *params);
 
-void                     flashback_monitor_labeler_hide  (FlashbackMonitorLabeler *labeler,
-                                                          const gchar             *sender);
+void                     flashback_monitor_labeler_hide (FlashbackMonitorLabeler *labeler,
+                                                         const gchar             *sender);
 
 G_END_DECLS
 
diff --git a/gnome-flashback/libshell/flashback-shell.c b/gnome-flashback/libshell/flashback-shell.c
index 9ef0ed4..4ab2a43 100644
--- a/gnome-flashback/libshell/flashback-shell.c
+++ b/gnome-flashback/libshell/flashback-shell.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Alberts Muktupāvels
+ * Copyright (C) 2015-2019 Alberts Muktupāvels
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -245,10 +245,10 @@ handle_show_osd (FlashbackDBusShell    *dbus_shell,
 }
 
 static gboolean
-handle_show_monitor_labels2 (FlashbackDBusShell    *dbus_shell,
-                             GDBusMethodInvocation *invocation,
-                             GVariant              *params,
-                             gpointer               user_data)
+handle_show_monitor_labels (FlashbackDBusShell    *dbus_shell,
+                            GDBusMethodInvocation *invocation,
+                            GVariant              *params,
+                            gpointer               user_data)
 {
   FlashbackShell *shell;
   const gchar *sender;
@@ -258,10 +258,10 @@ handle_show_monitor_labels2 (FlashbackDBusShell    *dbus_shell,
 
   g_assert (shell->monitor_manager != NULL);
 
-  flashback_monitor_labeler_show2 (shell->labeler, shell->monitor_manager,
-                                   sender, params);
+  flashback_monitor_labeler_show (shell->labeler, shell->monitor_manager,
+                                  sender, params);
 
-  flashback_dbus_shell_complete_show_monitor_labels2 (dbus_shell, invocation);
+  flashback_dbus_shell_complete_show_monitor_labels (dbus_shell, invocation);
 
   return TRUE;
 }
@@ -441,8 +441,8 @@ name_appeared_handler (GDBusConnection *connection,
                     G_CALLBACK (handle_focus_search), shell);
   g_signal_connect (skeleton, "handle-show-osd",
                     G_CALLBACK (handle_show_osd), shell);
-  g_signal_connect (skeleton, "handle-show-monitor-labels2",
-                    G_CALLBACK (handle_show_monitor_labels2), shell);
+  g_signal_connect (skeleton, "handle-show-monitor-labels",
+                    G_CALLBACK (handle_show_monitor_labels), shell);
   g_signal_connect (skeleton, "handle-hide-monitor-labels",
                     G_CALLBACK (handle_hide_monitor_labels), shell);
   g_signal_connect (skeleton, "handle-focus-app",
diff --git a/gnome-flashback/libshell/org.gnome.Shell.xml b/gnome-flashback/libshell/org.gnome.Shell.xml
index 42e2983..bc3b37b 100644
--- a/gnome-flashback/libshell/org.gnome.Shell.xml
+++ b/gnome-flashback/libshell/org.gnome.Shell.xml
@@ -10,7 +10,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" />