[gtk/ebassi/for-master: 2/4] Hide gdk_wayland_display_prefers_ssd()




commit 38304fc138cb5202e802c83f3cd6b82c74df0eb8
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Oct 12 16:44:05 2020 +0100

    Hide gdk_wayland_display_prefers_ssd()
    
    The function is not exported, so it should not be in a public header.

 gdk/wayland/gdkdisplay-wayland.c | 2 +-
 gdk/wayland/gdkdisplay-wayland.h | 2 ++
 gdk/wayland/gdkwaylanddisplay.h  | 2 --
 gtk/gtkwindow.c                  | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index b2c182a884..c37ce3d4d0 100644
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -384,7 +384,7 @@ static const struct org_kde_kwin_server_decoration_manager_listener server_decor
   .default_mode = server_decoration_manager_default_mode
 };
 
-/**
+/*
  * gdk_wayland_display_prefers_ssd:
  * @display: (type GdkWaylandDisplay): a #GdkDisplay
  *
diff --git a/gdk/wayland/gdkdisplay-wayland.h b/gdk/wayland/gdkdisplay-wayland.h
index 49794d159e..886210ef3c 100644
--- a/gdk/wayland/gdkdisplay-wayland.h
+++ b/gdk/wayland/gdkdisplay-wayland.h
@@ -165,6 +165,8 @@ struct _GdkWaylandDisplayClass
   GdkDisplayClass parent_class;
 };
 
+gboolean                gdk_wayland_display_prefers_ssd         (GdkDisplay *display);
+
 G_END_DECLS
 
 #endif  /* __GDK_WAYLAND_DISPLAY__ */
diff --git a/gdk/wayland/gdkwaylanddisplay.h b/gdk/wayland/gdkwaylanddisplay.h
index f5d955f20f..0e3249dfb5 100644
--- a/gdk/wayland/gdkwaylanddisplay.h
+++ b/gdk/wayland/gdkwaylanddisplay.h
@@ -59,8 +59,6 @@ GDK_AVAILABLE_IN_ALL
 void                    gdk_wayland_display_set_startup_notification_id (GdkDisplay *display,
                                                                          const char *startup_id);
 
-gboolean                gdk_wayland_display_prefers_ssd         (GdkDisplay *display);
-
 GDK_AVAILABLE_IN_ALL
 gboolean                gdk_wayland_display_query_registry      (GdkDisplay  *display,
                                                                 const char *global);
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 1edcd5760b..d013bea14a 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -88,6 +88,7 @@
 
 #ifdef GDK_WINDOWING_WAYLAND
 #include "wayland/gdkwayland.h"
+#include "wayland/gdkdisplay-wayland.h"
 #include "wayland/gdksurface-wayland.h"
 #endif
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]