[mutter/wip/carlosg/xwayland-on-demand: 6/11] wayland: Rename xwayland init/shutdown functions
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/xwayland-on-demand: 6/11] wayland: Rename xwayland init/shutdown functions
- Date: Sat, 25 May 2019 10:14:44 +0000 (UTC)
commit d9b62351efe404c8d9e45e54ad82342056be4674
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri May 24 20:52:17 2019 +0200
wayland: Rename xwayland init/shutdown functions
The start/stop verbs will be reused later when we can start and
stop the X server. Rename these functions to init/shutdown, and
init_xserver() to start_xserver().
src/wayland/meta-wayland.c | 4 ++--
src/wayland/meta-xwayland-private.h | 6 +++---
src/wayland/meta-xwayland.c | 10 +++++-----
3 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index a593f0a7b..006b0e70e 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -415,7 +415,7 @@ meta_wayland_init (void)
if (meta_should_autostart_x11_display ())
{
- if (!meta_xwayland_start (&compositor->xwayland_manager, compositor->wayland_display))
+ if (!meta_xwayland_init (&compositor->xwayland_manager, compositor->wayland_display))
g_error ("Failed to start X Wayland");
}
@@ -463,7 +463,7 @@ meta_wayland_finalize (void)
compositor = meta_wayland_compositor_get_default ();
- meta_xwayland_stop (&compositor->xwayland_manager);
+ meta_xwayland_shutdown (&compositor->xwayland_manager);
g_clear_pointer (&compositor->display_name, g_free);
}
diff --git a/src/wayland/meta-xwayland-private.h b/src/wayland/meta-xwayland-private.h
index 9a109da66..ef5a3db51 100644
--- a/src/wayland/meta-xwayland-private.h
+++ b/src/wayland/meta-xwayland-private.h
@@ -25,14 +25,14 @@
#include "wayland/meta-wayland-private.h"
gboolean
-meta_xwayland_start (MetaXWaylandManager *manager,
- struct wl_display *display);
+meta_xwayland_init (MetaXWaylandManager *manager,
+ struct wl_display *display);
void
meta_xwayland_complete_init (MetaDisplay *display);
void
-meta_xwayland_stop (MetaXWaylandManager *manager);
+meta_xwayland_shutdown (MetaXWaylandManager *manager);
/* wl_data_device/X11 selection interoperation */
void meta_xwayland_init_dnd (void);
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c
index 43bf4c1e3..ab2c5f87c 100644
--- a/src/wayland/meta-xwayland.c
+++ b/src/wayland/meta-xwayland.c
@@ -466,7 +466,7 @@ on_displayfd_ready (int fd,
}
static gboolean
-meta_xwayland_init_xserver (MetaXWaylandManager *manager)
+meta_xwayland_start_xserver (MetaXWaylandManager *manager)
{
int xwayland_client_fd[2];
int displayfd[2];
@@ -539,14 +539,14 @@ meta_xwayland_init_xserver (MetaXWaylandManager *manager)
}
gboolean
-meta_xwayland_start (MetaXWaylandManager *manager,
- struct wl_display *wl_display)
+meta_xwayland_init (MetaXWaylandManager *manager,
+ struct wl_display *wl_display)
{
if (!choose_xdisplay (manager))
return FALSE;
manager->wayland_display = wl_display;
- return meta_xwayland_init_xserver (manager);
+ return meta_xwayland_start_xserver (manager);
}
static void
@@ -572,7 +572,7 @@ meta_xwayland_complete_init (MetaDisplay *display)
}
void
-meta_xwayland_stop (MetaXWaylandManager *manager)
+meta_xwayland_shutdown (MetaXWaylandManager *manager)
{
char path[256];
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]