get XDisplay from window instead of display, as display has not been

Thu Oct  3 23:53:43 2002  Kristian Rietveld  <kris@gtk.org>

        * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_destroy): get
        XDisplay from window instead of display, as display has not been
        defined here (fixes the build).

diff --git a/ChangeLog b/ChangeLog
index 6e54ae2fba4a98a2c70160772fec106e533a6d47..7f62092cbf3418de2a4b3874af61bbb66602c944 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Oct  3 23:53:43 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_destroy): get
+       XDisplay from window instead of display, as display has not been
+       defined here (fixes the build).
+
 Thu Oct  3 17:09:23 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/{gdkdrawable-x11.[ch],gdkpixmap-x11.c,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6e54ae2fba4a98a2c70160772fec106e533a6d47..7f62092cbf3418de2a4b3874af61bbb66602c944 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Oct  3 23:53:43 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_destroy): get
+       XDisplay from window instead of display, as display has not been
+       defined here (fixes the build).
+
 Thu Oct  3 17:09:23 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/{gdkdrawable-x11.[ch],gdkpixmap-x11.c,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6e54ae2fba4a98a2c70160772fec106e533a6d47..7f62092cbf3418de2a4b3874af61bbb66602c944 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Thu Oct  3 23:53:43 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_destroy): get
+       XDisplay from window instead of display, as display has not been
+       defined here (fixes the build).
+
 Thu Oct  3 17:09:23 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/{gdkdrawable-x11.[ch],gdkpixmap-x11.c,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6e54ae2fba4a98a2c70160772fec106e533a6d47..7f62092cbf3418de2a4b3874af61bbb66602c944 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Oct  3 23:53:43 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_destroy): get
+       XDisplay from window instead of display, as display has not been
+       defined here (fixes the build).
+
 Thu Oct  3 17:09:23 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/{gdkdrawable-x11.[ch],gdkpixmap-x11.c,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6e54ae2fba4a98a2c70160772fec106e533a6d47..7f62092cbf3418de2a4b3874af61bbb66602c944 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Oct  3 23:53:43 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_destroy): get
+       XDisplay from window instead of display, as display has not been
+       defined here (fixes the build).
+
 Thu Oct  3 17:09:23 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/{gdkdrawable-x11.[ch],gdkpixmap-x11.c,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6e54ae2fba4a98a2c70160772fec106e533a6d47..7f62092cbf3418de2a4b3874af61bbb66602c944 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Oct  3 23:53:43 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gdk/x11/gdkwindow-x11.c (_gdk_windowing_window_destroy): get
+       XDisplay from window instead of display, as display has not been
+       defined here (fixes the build).
+
 Thu Oct  3 17:09:23 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/{gdkdrawable-x11.[ch],gdkpixmap-x11.c,

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 4a7303445477303a7c1e4e94ac3e9dd6f08a5a07..610d36171c982cc68eb172967011d7c9cfbbd163 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -834,7 +834,7 @@ _gdk_windowing_window_destroy (GdkWindow *window,
       XftDrawDestroy (draw_impl->xft_draw);
 #else /* !HAVE_XFT2 */
     if (draw_impl->picture)
-      XRenderFreePicture (GDK_DISPLAY_XDISPLAY (display), draw_impl->picture);
+      XRenderFreePicture (GDK_DRAWABLE_XDISPLAY (window), draw_impl->picture);
 #endif /* HAVE_XFT2 */
   }
 #endif /* HAVE_XFT */