[compiz] - Don't rely on deprecated gdk symbol gdk_display.

[leigh123linux]

commit 94d992697794e57b09dd558af283872a1f0680cc
Author: leigh scott <leigh123linux at googlemail.com>
Date:   Thu Oct 14 17:25:36 2010 +0100

    - Don't rely on deprecated gdk symbol gdk_display.

 compiz.spec                  |    9 +++-
 gdk_display_deprecated.patch |   97 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+), 1 deletions(-)
---
diff --git a/compiz.spec b/compiz.spec
index de834b5..1b61bd4 100644
--- a/compiz.spec
+++ b/compiz.spec
@@ -11,7 +11,7 @@ URL:            http://www.go-compiz.org
 License:        GPLv2+ and LGPLv2+ and MIT
 Group:          User Interface/Desktops
 Version:        0.8.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +59,9 @@ Patch112: no-more-gnome-wm-settings.patch
 Patch113: compiz-0.8.6-icon-size.patch
 Patch114: compiz-0.8.6-map-gravity-fix.patch
 Patch115: compiz-0.8.6-focus-denied-stacking-fix.patch
+#upstream patches
+#http://gitweb.compiz.org/?p=compiz/core;a=commit;h=5ea5e2130c56d405fcccd63932918fc49ca1f1b9
+Patch116: gdk_display_deprecated.patch
 
 %description
 Compiz is one of the first OpenGL-accelerated compositing window
@@ -128,6 +131,7 @@ and other kde integration related stuff.
 %patch113 -p1 -b .icon-size
 %patch114 -p1 -b .map-request
 %patch115 -p1 -b .focus-denied-stacking
+%patch116 -p1 -b .gdk_display_deprecated
 
 %build
 rm -rf $RPM_BUILD_ROOT
@@ -283,6 +287,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 14 2010 leigh scott <leigh123linux at googlemail.com> - 0.8.6-5
+- Don't rely on deprecated gdk symbol gdk_display.
+
 * Wed Oct 06 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.8.6-4
 - Remove kde-desktop-effects.sh ("Compiz Switcher"), use System Settings instead
 
diff --git a/gdk_display_deprecated.patch b/gdk_display_deprecated.patch
new file mode 100644
index 0000000..d3f1094
--- /dev/null
+++ b/gdk_display_deprecated.patch
@@ -0,0 +1,97 @@
+From: Danny Baumann <dannybaumann at web.de>
+Date: Sun, 10 Oct 2010 12:22:09 +0000 (+0200)
+Subject: Don't rely on deprecated gdk symbol gdk_display.
+X-Git-Url: http://gitweb.compiz.org/?p=compiz%2Fcore;a=commitdiff_plain;h=5ea5e2130c56d405fcccd63932918fc49ca1f1b9
+
+Don't rely on deprecated gdk symbol gdk_display.
+---
+
+diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
+index adb20d5..4fac3d3 100644
+--- a/gtk/window-decorator/gtk-window-decorator.c
++++ b/gtk/window-decorator/gtk-window-decorator.c
+@@ -2635,6 +2635,7 @@ get_window_prop (Window xwindow,
+ 		 Atom   atom,
+ 		 Window *val)
+ {
++    Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+     Atom   type;
+     int	   format;
+     gulong nitems;
+@@ -2647,7 +2648,7 @@ get_window_prop (Window xwindow,
+     gdk_error_trap_push ();
+ 
+     type = None;
+-    result = XGetWindowProperty (gdk_display,
++    result = XGetWindowProperty (dpy,
+ 				 xwindow,
+ 				 atom,
+ 				 0, G_MAXLONG,
+@@ -4940,7 +4941,7 @@ force_quit_dialog_realize (GtkWidget *dialog,
+     WnckWindow *win = data;
+ 
+     gdk_error_trap_push ();
+-    XSetTransientForHint (gdk_display,
++    XSetTransientForHint (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+ 			  GDK_WINDOW_XID (dialog->window),
+ 			  wnck_window_get_xid (win));
+     gdk_display_sync (gdk_display_get_default ());
+@@ -4950,17 +4951,18 @@ force_quit_dialog_realize (GtkWidget *dialog,
+ static char *
+ get_client_machine (Window xwindow)
+ {
+-    Atom   atom, type;
+-    gulong nitems, bytes_after;
+-    guchar *str = NULL;
+-    int    format, result;
+-    char   *retval;
++    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
++    Atom    atom, type;
++    gulong  nitems, bytes_after;
++    guchar  *str = NULL;
++    int     format, result;
++    char    *retval;
+ 
+-    atom = XInternAtom (gdk_display, "WM_CLIENT_MACHINE", FALSE);
++    atom = XInternAtom (xdisplay, "WM_CLIENT_MACHINE", FALSE);
+ 
+     gdk_error_trap_push ();
+ 
+-    result = XGetWindowProperty (gdk_display,
++    result = XGetWindowProperty (xdisplay,
+ 				 xwindow, atom,
+ 				 0, G_MAXLONG,
+ 				 FALSE, XA_STRING, &type, &format, &nitems,
+@@ -4987,6 +4989,8 @@ get_client_machine (Window xwindow)
+ static void
+ kill_window (WnckWindow *win)
+ {
++    GdkDisplay      *gdk_display = gdk_display_get_default ();
++    Display         *xdisplay    = GDK_DISPLAY_XDISPLAY (gdk_display);
+     WnckApplication *app;
+ 
+     app = wnck_window_get_application (win);
+@@ -5012,8 +5016,8 @@ kill_window (WnckWindow *win)
+     }
+ 
+     gdk_error_trap_push ();
+-    XKillClient (gdk_display, wnck_window_get_xid (win));
+-    gdk_display_sync (gdk_display_get_default ());
++    XKillClient (xdisplay, wnck_window_get_xid (win));
++    gdk_display_sync (gdk_display);
+     gdk_error_trap_pop ();
+ }
+ 
+@@ -5597,9 +5601,9 @@ static int
+ update_shadow (void)
+ {
+     decor_shadow_options_t opt;
+-    Display		   *xdisplay = gdk_display;
+-    GdkDisplay		   *display = gdk_display_get_default ();
+-    GdkScreen		   *screen = gdk_display_get_default_screen (display);
++    GdkDisplay		   *display  = gdk_display_get_default ();
++    Display		   *xdisplay = GDK_DISPLAY_XDISPLAY (display);
++    GdkScreen		   *screen   = gdk_display_get_default_screen (display);
+ 
+     opt.shadow_radius  = shadow_radius;
+     opt.shadow_opacity = shadow_opacity;