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

x11: Drop error trap helpers

Browse Source 
They are no longer that useful as they end up calling
mtk functions nowadays

Followup of https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3230

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3483>
This commit is contained in:
Bilal Elmoussaoui
2024-01-03 15:43:36 +01:00
committed by Robert Mader
parent 5564eaeb4a
commit 94f9d88371
35 changed files with 208 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/x11/meta-x11-selection-input-stream.c
View File

@ -23,7 +23,7 @@
#include "meta-x11-selection-input-stream-private.h"
#include "meta/meta-x11-errors.h"
#include "mtk/mtk-x11.h"
#include "x11/meta-x11-display-private.h"
typedef struct MetaX11SelectionInputStreamPrivate MetaX11SelectionInputStreamPrivate;
@ -128,9 +128,9 @@ meta_x11_selection_input_stream_flush (MetaX11SelectionInputStream *stream)
Display *xdisplay = priv->x11_display->xdisplay;
gssize written;
meta_x11_error_trap_push (priv->x11_display);
mtk_x11_error_trap_push (xdisplay);
XDeleteProperty (xdisplay, priv->window, priv->xproperty);
meta_x11_error_trap_pop (priv->x11_display);
mtk_x11_error_trap_pop (xdisplay);
if (!meta_x11_selection_input_stream_has_data (stream))
return;
@ -348,18 +348,18 @@ get_selection_property (MetaX11Display *x11_display,
gint prop_format;
uint8_t *data = NULL;
meta_x11_error_trap_push (x11_display);
mtk_x11_error_trap_push (x11_display->xdisplay);
if (XGetWindowProperty (x11_display->xdisplay, owner, property,
0, 0x1FFFFFFF, False,
AnyPropertyType, &prop_type, &prop_format,
&nitems, &nbytes, &data) != Success)
{
meta_x11_error_trap_pop (x11_display);
mtk_x11_error_trap_pop (x11_display->xdisplay);
goto err;
}
if (meta_x11_error_trap_pop_with_return (x11_display) != Success)
if (mtk_x11_error_trap_pop_with_return (x11_display->xdisplay) != Success)
goto err;
if (prop_type != None)