[mutter] wayland: Use wl_display_add_socket_auto
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] wayland: Use wl_display_add_socket_auto
- Date: Tue, 5 Aug 2014 20:12:37 +0000 (UTC)
commit 2ce23072d35a9151de79f15d41ac4a77a77d4dc3
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Aug 5 16:10:17 2014 -0400
wayland: Use wl_display_add_socket_auto
src/wayland/meta-wayland-private.h | 2 +-
src/wayland/meta-wayland.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/wayland/meta-wayland-private.h b/src/wayland/meta-wayland-private.h
index 9e35e1c..0edc725 100644
--- a/src/wayland/meta-wayland-private.h
+++ b/src/wayland/meta-wayland-private.h
@@ -70,7 +70,7 @@ typedef struct
struct _MetaWaylandCompositor
{
struct wl_display *wayland_display;
- char *display_name;
+ const char *display_name;
ClutterActor *stage;
GHashTable *outputs;
struct wl_list frame_callbacks;
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 1a4dacb..7e83bf3 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -417,8 +417,8 @@ meta_wayland_init (void)
meta_wayland_seat_init (compositor);
/* FIXME: find the first free name instead */
- compositor->display_name = g_strdup ("wayland-0");
- if (wl_display_add_socket (compositor->wayland_display, compositor->display_name))
+ compositor->display_name = wl_display_add_socket_auto (compositor->wayland_display);
+ if (compositor->display_name == NULL)
g_error ("Failed to create socket");
/* XXX: It's important that we only try and start xwayland after we
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]