[mutter] stage/x11: Fix clutter backend variable naming
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] stage/x11: Fix clutter backend variable naming
- Date: Mon, 17 May 2021 16:34:29 +0000 (UTC)
commit 3bb686591257979a68c576f1ce533f06304cbe78
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Wed Mar 3 15:58:20 2021 +0100
stage/x11: Fix clutter backend variable naming
Being in backends/, `backend` tends to refer to a `MetaBackend`, so
avoid that naming convention for things that are not, e.g. clutter
backends.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1833>
src/backends/x11/meta-stage-x11.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/backends/x11/meta-stage-x11.c b/src/backends/x11/meta-stage-x11.c
index 938d65cbff..ef6fd0320a 100644
--- a/src/backends/x11/meta-stage-x11.c
+++ b/src/backends/x11/meta-stage-x11.c
@@ -616,7 +616,7 @@ meta_stage_x11_translate_event (MetaStageX11 *stage_x11,
{
ClutterStageCogl *stage_cogl;
gboolean res = FALSE;
- ClutterBackendX11 *backend_x11;
+ ClutterBackendX11 *clutter_backend_x11;
ClutterStage *stage;
stage_cogl = meta_x11_get_stage_window_from_window (xevent->xany.window);
@@ -624,7 +624,7 @@ meta_stage_x11_translate_event (MetaStageX11 *stage_x11,
return FALSE;
stage = stage_cogl->wrapper;
- backend_x11 = CLUTTER_BACKEND_X11 (stage_cogl->backend);
+ clutter_backend_x11 = CLUTTER_BACKEND_X11 (stage_cogl->backend);
switch (xevent->type)
{
@@ -779,9 +779,11 @@ meta_stage_x11_translate_event (MetaStageX11 *stage_x11,
g_debug ("Client message for stage, win:0x%x",
(unsigned int) xevent->xany.window);
- if (xevent->xclient.message_type == backend_x11->atom_WM_PROTOCOLS)
+ if (xevent->xclient.message_type == clutter_backend_x11->atom_WM_PROTOCOLS)
{
- if (handle_wm_protocols_event (backend_x11, stage_x11, xevent))
+ if (handle_wm_protocols_event (clutter_backend_x11,
+ stage_x11,
+ xevent))
{
g_return_val_if_fail (META_IS_STAGE_X11_NESTED (stage_x11),
FALSE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]