1 --- emerald-0.8.4/src/main.c.orig 2010-10-27 23:09:01.000000000 +0200
2 +++ emerald-0.8.4/src/main.c 2010-10-27 23:08:34.000000000 +0200
7 - result = XGetWindowProperty(gdk_display,
8 + result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
12 @@ -4243,13 +4243,14 @@
14 static void force_quit_dialog_realize(GtkWidget * dialog, void *data)
16 + Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
17 WnckWindow *win = data;
19 gdk_error_trap_push();
20 - XSetTransientForHint(gdk_display,
21 + XSetTransientForHint(xdisplay,
22 GDK_WINDOW_XID(dialog->window),
23 wnck_window_get_xid(win));
24 - XSync(gdk_display, FALSE);
25 + XSync(xdisplay, FALSE);
29 @@ -4261,12 +4262,13 @@
30 unsigned char *sstr = NULL;
33 + Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
35 - atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE);
36 + atom = XInternAtom(xdisplay, "WM_CLIENT_MACHINE", FALSE);
38 gdk_error_trap_push();
40 - result = XGetWindowProperty(gdk_display,
41 + result = XGetWindowProperty(xdisplay,
44 FALSE, XA_STRING, &type, &format, &nitems,
47 static void kill_window(WnckWindow * win)
49 + GdkDisplay *gdk_display = gdk_display_get_default ();
50 + Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display);
53 app = wnck_window_get_application(win);
57 gdk_error_trap_push();
58 - XKillClient(gdk_display, wnck_window_get_xid(win));
59 + XKillClient(xdisplay, wnck_window_get_xid(win));
60 XSync(gdk_display, FALSE);
65 static int update_shadow(frame_settings * fs)
67 - Display *xdisplay = gdk_display;
68 + GdkDisplay *display = gdk_display_get_default ();
69 + Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
70 XRenderPictFormat *format;
72 Picture src, dst, tmp;