fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-08 21:00:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure we call XFlush() on all code paths (FDO bug #15293)

Browse source
This commit is contained in:
Colin Walters 2008-03-31 18:16:00 -04:00
parent 4058579dae
commit 193ebb7083
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-03-26 Colin Walters <walters@verbum.org>
Patch from Owen Taylor <otaylor@redhat.com>
* tools/dbus-launch-x11.c: Make sure we call XFlush()
on all code paths (FDO bug #15293)
2008-03-27 Havoc Pennington <hp@redhat.com>
* tools/dbus-send.c (append_dict): Do not provide a signature to

10
tools/dbus-launch-x11.c
View file

@ -341,7 +341,7 @@ static Window
set_address_in_x11(char *address, pid_t pid)
{
char *current_address;
Window wid;
Window wid = None;
unsigned long pid32; /* Xlib property functions want _long_ not 32-bit for format "32" */
/* lock the X11 display to make sure we're doing this atomically */
@ -350,16 +350,14 @@ set_address_in_x11(char *address, pid_t pid)
if (!x11_get_address (&current_address, NULL, NULL))
{
/* error! */
XUngrabServer (xdisplay);
return None;
goto out;
}
if (current_address != NULL)
{
/* someone saved the address in the meantime */
XUngrabServer (xdisplay);
free (current_address);
return None;
goto out;
}
/* Create our window */
@ -378,9 +376,11 @@ set_address_in_x11(char *address, pid_t pid)
/* Now grab the selection */
XSetSelectionOwner (xdisplay, selection_atom, wid, CurrentTime);
out:
/* Ungrab the server to let other people use it too */
XUngrabServer (xdisplay);
/* And make sure that the ungrab gets sent to X11 */
XFlush (xdisplay);
return wid;