minecraft-pi-reborn/zenity
Archived
1
0
Fork 0
Code Pull Requests Activity

Remove GDK_DISPLAY() usage. Fixes build with GTK+-3.0

Browse Source 
Replaced by GDK_DISPLAY_XDISPLAY.
This commit is contained in:
Luis Medinas 2010-10-02 20:00:04 +01:00 committed by Luis Medinas
parent 1bd26ef056
commit bb00f842d0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util.c
View File

@ -328,7 +328,7 @@ transient_get_xterm (void)
if (*wid_str != '\0' && *wid_str_end == '\0' && wid != 0) { if (*wid_str != '\0' && *wid_str_end == '\0' && wid != 0) {
XWindowAttributes attrs; XWindowAttributes attrs;
gdk_error_trap_push (); gdk_error_trap_push ();
ret = XGetWindowAttributes (GDK_DISPLAY(), wid, &attrs); ret = XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wid, &attrs);
gdk_flush(); gdk_flush();
if (gdk_error_trap_pop () != 0 || ret == 0) { if (gdk_error_trap_pop () != 0 || ret == 0) {
return None; return None;
@ -350,7 +350,7 @@ static gboolean
transient_is_toplevel (Window wid) transient_is_toplevel (Window wid)
{ {
XTextProperty prop; XTextProperty prop;
Display *dpy = GDK_DISPLAY (); Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
if (!XGetWMName (dpy, wid, &prop)) if (!XGetWMName (dpy, wid, &prop))
return FALSE; return FALSE;
transient_x_free (prop.value); transient_x_free (prop.value);
@ -367,7 +367,7 @@ static Window
transient_get_xterm_toplevel (void) transient_get_xterm_toplevel (void)
{ {
Window xterm = transient_get_xterm (); Window xterm = transient_get_xterm ();
Display *dpy = GDK_DISPLAY (); Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
while (xterm != None && !transient_is_toplevel (xterm)) while (xterm != None && !transient_is_toplevel (xterm))
{ {
Window root, parent, *children; Window root, parent, *children;