[zenity] Remove GDK_DISPLAY() usage. Fixes build with GTK+-3.0
- From: Luis Medinas <lmedinas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [zenity] Remove GDK_DISPLAY() usage. Fixes build with GTK+-3.0
- Date: Sat, 2 Oct 2010 19:45:38 +0000 (UTC)
commit bb00f842d0e1504d53c348b9de3c7eadb5251796
Author: Luis Medinas <lmedinas gnome org>
Date: Sat Oct 2 20:00:04 2010 +0100
Remove GDK_DISPLAY() usage. Fixes build with GTK+-3.0
Replaced by GDK_DISPLAY_XDISPLAY.
src/util.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/util.c b/src/util.c
index 8f887f3..186a8db 100644
--- a/src/util.c
+++ b/src/util.c
@@ -328,7 +328,7 @@ transient_get_xterm (void)
if (*wid_str != '\0' && *wid_str_end == '\0' && wid != 0) {
XWindowAttributes attrs;
gdk_error_trap_push ();
- ret = XGetWindowAttributes (GDK_DISPLAY(), wid, &attrs);
+ ret = XGetWindowAttributes (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wid, &attrs);
gdk_flush();
if (gdk_error_trap_pop () != 0 || ret == 0) {
return None;
@@ -350,7 +350,7 @@ static gboolean
transient_is_toplevel (Window wid)
{
XTextProperty prop;
- Display *dpy = GDK_DISPLAY ();
+ Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
if (!XGetWMName (dpy, wid, &prop))
return FALSE;
transient_x_free (prop.value);
@@ -367,7 +367,7 @@ static Window
transient_get_xterm_toplevel (void)
{
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))
{
Window root, parent, *children;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]