]>
Commit | Line | Data |
---|---|---|
8cbf81e4 | 1 | From: Danny Baumann <dannybaumann@web.de> |
2 | Date: Sun, 10 Oct 2010 12:22:09 +0000 (+0200) | |
3 | Subject: Don't rely on deprecated gdk symbol gdk_display. | |
4 | X-Git-Url: http://gitweb.compiz.org/?p=compiz%2Fcore;a=commitdiff_plain;h=5ea5e2130c56d405fcccd63932918fc49ca1f1b9 | |
5 | ||
6 | Don't rely on deprecated gdk symbol gdk_display. | |
7 | --- | |
8 | ||
9 | diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c | |
10 | index adb20d5..4fac3d3 100644 | |
11 | --- a/gtk/window-decorator/gtk-window-decorator.c | |
12 | +++ b/gtk/window-decorator/gtk-window-decorator.c | |
13 | @@ -2635,6 +2635,7 @@ get_window_prop (Window xwindow, | |
14 | Atom atom, | |
15 | Window *val) | |
16 | { | |
17 | + Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); | |
18 | Atom type; | |
19 | int format; | |
20 | gulong nitems; | |
21 | @@ -2647,7 +2648,7 @@ get_window_prop (Window xwindow, | |
22 | gdk_error_trap_push (); | |
23 | ||
24 | type = None; | |
25 | - result = XGetWindowProperty (gdk_display, | |
26 | + result = XGetWindowProperty (dpy, | |
27 | xwindow, | |
28 | atom, | |
29 | 0, G_MAXLONG, | |
30 | @@ -4940,7 +4941,7 @@ force_quit_dialog_realize (GtkWidget *dialog, | |
31 | WnckWindow *win = data; | |
32 | ||
33 | gdk_error_trap_push (); | |
34 | - XSetTransientForHint (gdk_display, | |
35 | + XSetTransientForHint (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), | |
36 | GDK_WINDOW_XID (dialog->window), | |
37 | wnck_window_get_xid (win)); | |
38 | gdk_display_sync (gdk_display_get_default ()); | |
39 | @@ -4950,17 +4951,18 @@ force_quit_dialog_realize (GtkWidget *dialog, | |
40 | static char * | |
41 | get_client_machine (Window xwindow) | |
42 | { | |
43 | - Atom atom, type; | |
44 | - gulong nitems, bytes_after; | |
45 | - guchar *str = NULL; | |
46 | - int format, result; | |
47 | - char *retval; | |
48 | + Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); | |
49 | + Atom atom, type; | |
50 | + gulong nitems, bytes_after; | |
51 | + guchar *str = NULL; | |
52 | + int format, result; | |
53 | + char *retval; | |
54 | ||
55 | - atom = XInternAtom (gdk_display, "WM_CLIENT_MACHINE", FALSE); | |
56 | + atom = XInternAtom (xdisplay, "WM_CLIENT_MACHINE", FALSE); | |
57 | ||
58 | gdk_error_trap_push (); | |
59 | ||
60 | - result = XGetWindowProperty (gdk_display, | |
61 | + result = XGetWindowProperty (xdisplay, | |
62 | xwindow, atom, | |
63 | 0, G_MAXLONG, | |
64 | FALSE, XA_STRING, &type, &format, &nitems, | |
65 | @@ -4987,6 +4989,8 @@ get_client_machine (Window xwindow) | |
66 | static void | |
67 | kill_window (WnckWindow *win) | |
68 | { | |
69 | + GdkDisplay *gdk_display = gdk_display_get_default (); | |
70 | + Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display); | |
71 | WnckApplication *app; | |
72 | ||
73 | app = wnck_window_get_application (win); | |
74 | @@ -5012,8 +5016,8 @@ kill_window (WnckWindow *win) | |
75 | } | |
76 | ||
77 | gdk_error_trap_push (); | |
78 | - XKillClient (gdk_display, wnck_window_get_xid (win)); | |
79 | - gdk_display_sync (gdk_display_get_default ()); | |
80 | + XKillClient (xdisplay, wnck_window_get_xid (win)); | |
81 | + gdk_display_sync (gdk_display); | |
82 | gdk_error_trap_pop (); | |
83 | } | |
84 | ||
85 | @@ -5597,9 +5601,9 @@ static int | |
86 | update_shadow (void) | |
87 | { | |
88 | decor_shadow_options_t opt; | |
89 | - Display *xdisplay = gdk_display; | |
90 | - GdkDisplay *display = gdk_display_get_default (); | |
91 | - GdkScreen *screen = gdk_display_get_default_screen (display); | |
92 | + GdkDisplay *display = gdk_display_get_default (); | |
93 | + Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); | |
94 | + GdkScreen *screen = gdk_display_get_default_screen (display); | |
95 | ||
96 | opt.shadow_radius = shadow_radius; | |
97 | opt.shadow_opacity = shadow_opacity; |