diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2016-05-01 10:51:41 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2016-05-05 15:04:00 -0400 |
| commit | 4ad84363167550754c3584c079ccbb619e4a8d92 (patch) | |
| tree | cd59ae95356dd3898d7053213079d146f23afb26 | |
| parent | 631123bbd44af345724b66b9e7e055188351abde (diff) | |
| download | gtk+-4ad84363167550754c3584c079ccbb619e4a8d92.tar.gz | |
wayland: Make gdk_display_get_name work
It should just return the same as gdk_screen_make_display_name.
| -rw-r--r-- | gdk/wayland/gdkdisplay-wayland.c | 8 | ||||
| -rw-r--r-- | gdk/wayland/gdkscreen-wayland.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c index 8b35fb93b5..938d47d73c 100644 --- a/gdk/wayland/gdkdisplay-wayland.c +++ b/gdk/wayland/gdkdisplay-wayland.c @@ -505,7 +505,13 @@ gdk_wayland_display_finalize (GObject *object) static const gchar * gdk_wayland_display_get_name (GdkDisplay *display) { - return "Wayland"; + const gchar *name; + + name = g_getenv ("WAYLAND_DISPLAY"); + if (name == NULL) + name = "wayland-0"; + + return name; } static GdkScreen * diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c index 362029521b..a0583e40fa 100644 --- a/gdk/wayland/gdkscreen-wayland.c +++ b/gdk/wayland/gdkscreen-wayland.c @@ -301,13 +301,7 @@ gdk_wayland_screen_is_composited (GdkScreen *screen) static gchar * gdk_wayland_screen_make_display_name (GdkScreen *screen) { - const gchar *name; - - name = g_getenv ("WAYLAND_DISPLAY"); - if (name == NULL) - name = "wayland-0"; - - return g_strdup (name); + return g_strdup (gdk_display_get_name (GDK_WAYLAND_SCREEN (screen)->display)); } static GdkWindow * |