diff options
| author | Benjamin Otte <otte@redhat.com> | 2017-12-14 13:02:50 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2017-12-14 13:35:32 +0100 |
| commit | 920259c25070986b13675fd86f3def1b805dc00d (patch) | |
| tree | 7bf7398788e69f87a541f49c2655b2e778984892 /gtk/gtkmountoperation-x11.c | |
| parent | 52b1a465496be8bf763bbf6a1945ec769be653b5 (diff) | |
| download | gtk+-920259c25070986b13675fd86f3def1b805dc00d.tar.gz | |
x11: Get rid of default Atom converters
No, using the default Wayland display is not okay to query Atoms.
Diffstat (limited to 'gtk/gtkmountoperation-x11.c')
| -rw-r--r-- | gtk/gtkmountoperation-x11.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkmountoperation-x11.c b/gtk/gtkmountoperation-x11.c index 562fa8daee..345570c301 100644 --- a/gtk/gtkmountoperation-x11.c +++ b/gtk/gtkmountoperation-x11.c @@ -136,7 +136,7 @@ get_utf8_property (GdkDisplay *display, char *retval; Atom utf8_string; - utf8_string = gdk_x11_get_xatom_by_name ("UTF8_STRING"); + utf8_string = gdk_x11_get_xatom_by_name_for_display (display, "UTF8_STRING"); gdk_x11_display_error_trap_push (display); type = None; @@ -167,7 +167,7 @@ get_utf8_property (GdkDisplay *display, if (!g_utf8_validate (val, nitems, NULL)) { g_warning ("Property %s contained invalid UTF-8", - gdk_x11_get_xatom_name (atom)); + gdk_x11_get_xatom_name_for_display (display, atom)); XFree (val); return NULL; } @@ -365,7 +365,7 @@ read_rgb_icon (GdkDisplay *display, data = NULL; result = XGetWindowProperty (xdisplay, xwindow, - gdk_x11_get_xatom_by_name ("_NET_WM_ICON"), + gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_ICON"), 0, G_MAXLONG, False, XA_CARDINAL, &type, &format, &nitems, &bytes_after, (void*)&data); |