You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.5 KiB
42 lines
1.5 KiB
4 weeks ago
|
From 5b589b298680bd394dd6a1ee7bef3d7def1a96c8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
||
|
|
Date: Mon, 23 Oct 2023 14:47:33 +0800
|
||
|
|
Subject: [PATCH 4/4] display: Rename mandatory X11 initialization function
|
||
|
|
|
||
|
|
Simply to make it clear that the renamed function is specific to a
|
||
|
|
particular X11 initialization mode (mandatory Xwayland), put that in the
|
||
|
|
name, so that it's easier to understand when this function is relevant.
|
||
|
|
---
|
||
|
|
src/core/display.c | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/display.c b/src/core/display.c
|
||
|
|
index ddd475f457..e4f623ff9d 100644
|
||
|
|
--- a/src/core/display.c
|
||
|
|
+++ b/src/core/display.c
|
||
|
|
@@ -910,9 +910,9 @@ meta_display_init_x11 (MetaDisplay *display,
|
||
|
|
}
|
||
|
|
|
||
|
|
static void
|
||
|
|
-on_x11_initialized (MetaDisplay *display,
|
||
|
|
- GAsyncResult *result,
|
||
|
|
- gpointer user_data)
|
||
|
|
+on_mandatory_x11_initialized (MetaDisplay *display,
|
||
|
|
+ GAsyncResult *result,
|
||
|
|
+ gpointer user_data)
|
||
|
|
{
|
||
|
|
g_autoptr (GError) error = NULL;
|
||
|
|
|
||
|
|
@@ -1035,7 +1035,7 @@ meta_display_new (MetaContext *context,
|
||
|
|
if (x11_display_policy == META_X11_DISPLAY_POLICY_MANDATORY)
|
||
|
|
{
|
||
|
|
meta_display_init_x11 (display, NULL,
|
||
|
|
- (GAsyncReadyCallback) on_x11_initialized,
|
||
|
|
+ (GAsyncReadyCallback) on_mandatory_x11_initialized,
|
||
|
|
NULL);
|
||
|
|
}
|
||
|
|
#endif /* HAVE_XWAYLAND */
|
||
|
|
--
|
||
|
|
2.44.0.501.g19981daefd.dirty
|
||
|
|
|