[gtk/ebassi/for-master: 4/4] Rename libgtk_only symbol in GdkWaylandToplevel

[Emmanuele Bassi <ebassi src gnome org>]

commit 13aa053f6bc15fab11548b5b161cf66ed6585212
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Oct 12 16:49:10 2020 +0100

    Rename libgtk_only symbol in GdkWaylandToplevel
    
    All public non-exported symbols in GDK can be used by GTK.

 gdk/wayland/gdksurface-wayland.c | 14 +++++++-------
 gdk/wayland/gdksurface-wayland.h | 20 ++++++++++----------
 gtk/gtkapplication-wayland.c     | 10 +++++++---
 3 files changed, 24 insertions(+), 20 deletions(-)
---
diff --git a/gdk/wayland/gdksurface-wayland.c b/gdk/wayland/gdksurface-wayland.c
index bb78d49730..ba5abff750 100644
--- a/gdk/wayland/gdksurface-wayland.c
+++ b/gdk/wayland/gdksurface-wayland.c
@@ -4168,13 +4168,13 @@ maybe_set_gtk_surface_dbus_properties (GdkWaylandSurface *impl)
 }
 
 void
-gdk_wayland_toplevel_set_dbus_properties_libgtk_only (GdkToplevel *toplevel,
-                                                      const char  *application_id,
-                                                      const char  *app_menu_path,
-                                                      const char  *menubar_path,
-                                                      const char  *window_object_path,
-                                                      const char  *application_object_path,
-                                                      const char *unique_bus_name)
+gdk_wayland_toplevel_set_dbus_properties (GdkToplevel *toplevel,
+                                          const char  *application_id,
+                                          const char  *app_menu_path,
+                                          const char  *menubar_path,
+                                          const char  *window_object_path,
+                                          const char  *application_object_path,
+                                          const char *unique_bus_name)
 {
   GdkWaylandSurface *impl;
 
diff --git a/gdk/wayland/gdksurface-wayland.h b/gdk/wayland/gdksurface-wayland.h
index 1ca3877a46..b0d0d6fc19 100644
--- a/gdk/wayland/gdksurface-wayland.h
+++ b/gdk/wayland/gdksurface-wayland.h
@@ -24,17 +24,17 @@
 
 G_BEGIN_DECLS
 
-void                     gdk_wayland_toplevel_set_dbus_properties_libgtk_only (GdkToplevel *toplevel,
-                                                                               const char  *application_id,
-                                                                               const char  *app_menu_path,
-                                                                               const char  *menubar_path,
-                                                                               const char  
*window_object_path,
-                                                                               const char  
*application_object_path,
-                                                                               const char  *unique_bus_name);
+void                     gdk_wayland_toplevel_set_dbus_properties       (GdkToplevel *toplevel,
+                                                                         const char  *application_id,
+                                                                         const char  *app_menu_path,
+                                                                         const char  *menubar_path,
+                                                                         const char  *window_object_path,
+                                                                         const char  
*application_object_path,
+                                                                         const char  *unique_bus_name);
 
-void                     gdk_wayland_toplevel_announce_csd       (GdkToplevel *toplevel);
+void                     gdk_wayland_toplevel_announce_csd              (GdkToplevel *toplevel);
 
-gboolean                 gdk_wayland_toplevel_inhibit_idle       (GdkToplevel *toplevel);
-void                     gdk_wayland_toplevel_uninhibit_idle     (GdkToplevel *toplevel);
+gboolean                 gdk_wayland_toplevel_inhibit_idle              (GdkToplevel *toplevel);
+void                     gdk_wayland_toplevel_uninhibit_idle            (GdkToplevel *toplevel);
 
 G_END_DECLS
diff --git a/gtk/gtkapplication-wayland.c b/gtk/gtkapplication-wayland.c
index a892f4be4b..76fa144751 100644
--- a/gtk/gtkapplication-wayland.c
+++ b/gtk/gtkapplication-wayland.c
@@ -84,9 +84,13 @@ gtk_application_impl_wayland_handle_window_realize (GtkApplicationImpl *impl,
 
   window_path = gtk_application_impl_dbus_get_window_path (dbus, window);
 
-  gdk_wayland_toplevel_set_dbus_properties_libgtk_only (GDK_TOPLEVEL (gdk_surface),
-                                                        dbus->application_id, dbus->app_menu_path, 
dbus->menubar_path,
-                                                        window_path, dbus->object_path, dbus->unique_name);
+  gdk_wayland_toplevel_set_dbus_properties (GDK_TOPLEVEL (gdk_surface),
+                                            dbus->application_id,
+                                            dbus->app_menu_path,
+                                            dbus->menubar_path,
+                                            window_path,
+                                            dbus->object_path,
+                                            dbus->unique_name);
 
   g_free (window_path);