diff options
| author | raveit65 <[email protected]> | 2018-08-23 10:46:54 +0200 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-08-23 11:47:58 +0200 |
| commit | 66b5931c274c0fadffeaecaa8e021e9b8e0e7761 (patch) | |
| tree | 6ebbd7f380bb53966f67db7b10360e5d76d8fb18 /plugins/xsettings | |
| parent | 03368ab744d09ce308c384c3b976886794d5c4b7 (diff) | |
| download | mate-settings-daemon-66b5931c274c0fadffeaecaa8e021e9b8e0e7761.tar.bz2 mate-settings-daemon-66b5931c274c0fadffeaecaa8e021e9b8e0e7761.tar.xz | |
xsettings: replace deprecated gdk_error_trap_push/pop
Diffstat (limited to 'plugins/xsettings')
| -rw-r--r-- | plugins/xsettings/wm-common.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/plugins/xsettings/wm-common.c b/plugins/xsettings/wm-common.c index ccb9629..8b5be13 100644 --- a/plugins/xsettings/wm-common.c +++ b/plugins/xsettings/wm-common.c @@ -1,4 +1,4 @@ -#include <X11/Xatom.h> + #include <X11/Xatom.h> #include <gdk/gdkx.h> #include <gdk/gdk.h> #include <string.h> @@ -13,6 +13,7 @@ static char * wm_common_get_window_manager_property (Atom atom) { Atom utf8_string, type; + GdkDisplay *display; int result; char *retval; int format; @@ -25,10 +26,12 @@ wm_common_get_window_manager_property (Atom atom) utf8_string = gdk_x11_get_xatom_by_name ("UTF8_STRING"); - gdk_error_trap_push (); + display = gdk_display_get_default (); + + gdk_x11_display_error_trap_push (display); val = NULL; - result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), + result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), wm_window, atom, 0, G_MAXLONG, @@ -36,7 +39,7 @@ wm_common_get_window_manager_property (Atom atom) &type, &format, &nitems, &bytes_after, (guchar **) &val); - if (gdk_error_trap_pop () || result != Success || + if (gdk_x11_display_error_trap_pop (display) || result != Success || type != utf8_string || format != 8 || nitems == 0 || !g_utf8_validate (val, nitems, NULL)) { @@ -69,13 +72,16 @@ wm_common_get_current_window_manager (void) static void update_wm_window (void) { + GdkDisplay *display; Window *xwindow; Atom type; gint format; gulong nitems; gulong bytes_after; - XGetWindowProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), GDK_ROOT_WINDOW (), + display = gdk_display_get_default (); + + XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_ROOT_WINDOW (), gdk_x11_get_xatom_by_name ("_NET_SUPPORTING_WM_CHECK"), 0, G_MAXLONG, False, XA_WINDOW, &type, &format, &nitems, &bytes_after, (guchar **) &xwindow); @@ -86,11 +92,11 @@ update_wm_window (void) return; } - gdk_error_trap_push (); - XSelectInput (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), *xwindow, StructureNotifyMask | PropertyChangeMask); - XSync (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), False); + gdk_x11_display_error_trap_push (display); + XSelectInput (GDK_DISPLAY_XDISPLAY (display), *xwindow, StructureNotifyMask | PropertyChangeMask); + XSync (GDK_DISPLAY_XDISPLAY (display), False); - if (gdk_error_trap_pop ()) + if (gdk_x11_display_error_trap_pop (display)) { XFree (xwindow); wm_window = None; |