| 1 |
ikelos 10/12/04 19:09:19 |
| 2 |
|
| 3 |
Added: compiz-0.8.6-gdk-display-deprecated.patch |
| 4 |
Log: |
| 5 |
Add in patch to fix deprecated use of gdk-display (bug 344293). |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha6/cvs/Linux i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-wm/compiz/files/compiz-0.8.6-gdk-display-deprecated.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/compiz/files/compiz-0.8.6-gdk-display-deprecated.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-wm/compiz/files/compiz-0.8.6-gdk-display-deprecated.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: compiz-0.8.6-gdk-display-deprecated.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c |
| 18 |
index 18b907e..2af99b9 100644 |
| 19 |
--- a/gtk/window-decorator/gtk-window-decorator.c |
| 20 |
+++ b/gtk/window-decorator/gtk-window-decorator.c |
| 21 |
@@ -41,6 +41,7 @@ |
| 22 |
|
| 23 |
#include <gtk/gtk.h> |
| 24 |
#include <gdk/gdkx.h> |
| 25 |
+#include <gdk/gdkgc.h> |
| 26 |
#include <glib/gi18n.h> |
| 27 |
|
| 28 |
#ifdef USE_GCONF |
| 29 |
@@ -2659,6 +2660,7 @@ get_window_prop (Window xwindow, |
| 30 |
Atom atom, |
| 31 |
Window *val) |
| 32 |
{ |
| 33 |
+ Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); |
| 34 |
Atom type; |
| 35 |
int format; |
| 36 |
gulong nitems; |
| 37 |
@@ -2671,7 +2673,7 @@ get_window_prop (Window xwindow, |
| 38 |
gdk_error_trap_push (); |
| 39 |
|
| 40 |
type = None; |
| 41 |
- result = XGetWindowProperty (gdk_display, |
| 42 |
+ result = XGetWindowProperty (dpy, |
| 43 |
xwindow, |
| 44 |
atom, |
| 45 |
0, G_MAXLONG, |
| 46 |
@@ -4966,7 +4968,7 @@ force_quit_dialog_realize (GtkWidget *dialog, |
| 47 |
WnckWindow *win = data; |
| 48 |
|
| 49 |
gdk_error_trap_push (); |
| 50 |
- XSetTransientForHint (gdk_display, |
| 51 |
+ XSetTransientForHint (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), |
| 52 |
GDK_WINDOW_XID (dialog->window), |
| 53 |
wnck_window_get_xid (win)); |
| 54 |
gdk_display_sync (gdk_display_get_default ()); |
| 55 |
@@ -4976,17 +4978,18 @@ force_quit_dialog_realize (GtkWidget *dialog, |
| 56 |
static char * |
| 57 |
get_client_machine (Window xwindow) |
| 58 |
{ |
| 59 |
- Atom atom, type; |
| 60 |
- gulong nitems, bytes_after; |
| 61 |
- guchar *str = NULL; |
| 62 |
- int format, result; |
| 63 |
- char *retval; |
| 64 |
+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); |
| 65 |
+ Atom atom, type; |
| 66 |
+ gulong nitems, bytes_after; |
| 67 |
+ guchar *str = NULL; |
| 68 |
+ int format, result; |
| 69 |
+ char *retval; |
| 70 |
|
| 71 |
- atom = XInternAtom (gdk_display, "WM_CLIENT_MACHINE", FALSE); |
| 72 |
+ atom = XInternAtom (xdisplay, "WM_CLIENT_MACHINE", FALSE); |
| 73 |
|
| 74 |
gdk_error_trap_push (); |
| 75 |
|
| 76 |
- result = XGetWindowProperty (gdk_display, |
| 77 |
+ result = XGetWindowProperty (xdisplay, |
| 78 |
xwindow, atom, |
| 79 |
0, G_MAXLONG, |
| 80 |
FALSE, XA_STRING, &type, &format, &nitems, |
| 81 |
@@ -5013,6 +5016,8 @@ get_client_machine (Window xwindow) |
| 82 |
static void |
| 83 |
kill_window (WnckWindow *win) |
| 84 |
{ |
| 85 |
+ GdkDisplay *gdk_display = gdk_display_get_default (); |
| 86 |
+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display); |
| 87 |
WnckApplication *app; |
| 88 |
|
| 89 |
app = wnck_window_get_application (win); |
| 90 |
@@ -5038,8 +5043,8 @@ kill_window (WnckWindow *win) |
| 91 |
} |
| 92 |
|
| 93 |
gdk_error_trap_push (); |
| 94 |
- XKillClient (gdk_display, wnck_window_get_xid (win)); |
| 95 |
- gdk_display_sync (gdk_display_get_default ()); |
| 96 |
+ XKillClient (xdisplay, wnck_window_get_xid (win)); |
| 97 |
+ gdk_display_sync (gdk_display); |
| 98 |
gdk_error_trap_pop (); |
| 99 |
} |
| 100 |
|
| 101 |
@@ -5623,9 +5628,9 @@ static int |
| 102 |
update_shadow (void) |
| 103 |
{ |
| 104 |
decor_shadow_options_t opt; |
| 105 |
- Display *xdisplay = gdk_display; |
| 106 |
- GdkDisplay *display = gdk_display_get_default (); |
| 107 |
- GdkScreen *screen = gdk_display_get_default_screen (display); |
| 108 |
+ GdkDisplay *display = gdk_display_get_default (); |
| 109 |
+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (display); |
| 110 |
+ GdkScreen *screen = gdk_display_get_default_screen (display); |
| 111 |
|
| 112 |
opt.shadow_radius = shadow_radius; |
| 113 |
opt.shadow_opacity = shadow_opacity; |
Archives