brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backends/x11: Add pair of error trap init/deinit calls

Browse Source 
Add a pair of calls to ensure the error trap infrastructure
survives for the MetaBackend. This will help on later commits that
largely operate on the MetaBackendX11 Display.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3230>
This commit is contained in:
Carlos Garnacho 2023-09-01 01:14:51 +02:00 committed by Marge Bot
parent ef366c5fcb
commit 99bcd20f0a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backends/x11/meta-backend-x11.c
View File

@ -57,6 +57,7 @@
#include "core/display-private.h" #include "core/display-private.h"
#include "meta/meta-cursor-tracker.h" #include "meta/meta-cursor-tracker.h"
#include "meta/util.h" #include "meta/util.h"
#include "mtk/mtk-x11-errors.h"
struct _MetaBackendX11Private struct _MetaBackendX11Private
{ {
@ -903,6 +904,8 @@ meta_backend_x11_initable_init (GInitable *initable,
XSynchronize (xdisplay, meta_context_is_x11_sync (context)); XSynchronize (xdisplay, meta_context_is_x11_sync (context));
mtk_x11_errors_init ();
priv->xdisplay = xdisplay; priv->xdisplay = xdisplay;
priv->xscreen = DefaultScreenOfDisplay (xdisplay); priv->xscreen = DefaultScreenOfDisplay (xdisplay);
priv->xcb = XGetXCBConnection (priv->xdisplay); priv->xcb = XGetXCBConnection (priv->xdisplay);
@ -965,6 +968,8 @@ meta_backend_x11_finalize (GObject *object)
g_clear_pointer (&priv->keymap, xkb_keymap_unref); g_clear_pointer (&priv->keymap, xkb_keymap_unref);
mtk_x11_errors_deinit ();
G_OBJECT_CLASS (meta_backend_x11_parent_class)->finalize (object); G_OBJECT_CLASS (meta_backend_x11_parent_class)->finalize (object);
} }