diff options
author | Jeremy Bicha <jbicha@debian.org> | 2021-09-19 08:31:04 -0400 |
---|---|---|
committer | Jeremy Bicha <jbicha@debian.org> | 2021-09-19 08:31:04 -0400 |
commit | 8be77dbb38d2d96e66cadc38a9adb30f161c7ad0 (patch) | |
tree | d6d626e993d2ba4c301cb27346022e568d965c21 /src/util.c | |
parent | New upstream version 3.32.0 (diff) | |
parent | Bump version for 3.41.0 (diff) | |
download | zenity-8be77dbb38d2d96e66cadc38a9adb30f161c7ad0.tar.gz zenity-8be77dbb38d2d96e66cadc38a9adb30f161c7ad0.tar.bz2 zenity-8be77dbb38d2d96e66cadc38a9adb30f161c7ad0.zip |
New upstream version 3.41.0
Diffstat (limited to 'src/util.c')
-rw-r--r-- | src/util.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -153,7 +153,7 @@ zenity_util_fill_file_buffer (GtkTextBuffer *buffer, const gchar *filename) { gtk_text_buffer_insert (buffer, &iter, buf, leftover - buf); remaining = (buf + remaining + count) - leftover; - g_memmove (buf, leftover, remaining); + memmove (buf, leftover, remaining); if (remaining > 6 || count < to_read) break; @@ -326,11 +326,12 @@ transient_get_xterm (void) { Window wid = strtoul (wid_str, &wid_str_end, 10); if (*wid_str != '\0' && *wid_str_end == '\0' && wid != 0) { XWindowAttributes attrs; - gdk_error_trap_push (); + GdkDisplay *display; + display = gdk_display_get_default (); + gdk_x11_display_error_trap_push (display); ret = XGetWindowAttributes ( GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wid, &attrs); - gdk_flush (); - if (gdk_error_trap_pop () != 0 || ret == 0) { + if (gdk_x11_display_error_trap_pop (display) != 0 || ret == 0) { return None; } return wid; |