From 64e8303a793930cc037d7ef659c6f8a6ab05612b Mon Sep 17 00:00:00 2001
From: Owen Taylor <otaylor@redhat.com>
Date: Fri, 2 Aug 2002 19:19:42 +0000
Subject: [PATCH] Call pango_x[ft]_shutdown_display().

Fri Aug  2 12:21:41 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose):
        Call pango_x[ft]_shutdown_display().
---
 ChangeLog               |  5 +++++
 ChangeLog.pre-2-10      |  5 +++++
 ChangeLog.pre-2-2       |  5 +++++
 ChangeLog.pre-2-4       |  5 +++++
 ChangeLog.pre-2-6       |  5 +++++
 ChangeLog.pre-2-8       |  5 +++++
 gdk/x11/gdkscreen-x11.c | 10 ++++++++++
 7 files changed, 40 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c4d0b29c6e..67a39d6183 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug  2 12:21:41 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose):
+	Call pango_x[ft]_shutdown_display().
+
 2002-08-02  jacob berkman  <jacob@ximian.com>
 
 	* gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c4d0b29c6e..67a39d6183 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Aug  2 12:21:41 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose):
+	Call pango_x[ft]_shutdown_display().
+
 2002-08-02  jacob berkman  <jacob@ximian.com>
 
 	* gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c4d0b29c6e..67a39d6183 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri Aug  2 12:21:41 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose):
+	Call pango_x[ft]_shutdown_display().
+
 2002-08-02  jacob berkman  <jacob@ximian.com>
 
 	* gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c4d0b29c6e..67a39d6183 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Aug  2 12:21:41 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose):
+	Call pango_x[ft]_shutdown_display().
+
 2002-08-02  jacob berkman  <jacob@ximian.com>
 
 	* gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c4d0b29c6e..67a39d6183 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Aug  2 12:21:41 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose):
+	Call pango_x[ft]_shutdown_display().
+
 2002-08-02  jacob berkman  <jacob@ximian.com>
 
 	* gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c4d0b29c6e..67a39d6183 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Aug  2 12:21:41 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose):
+	Call pango_x[ft]_shutdown_display().
+
 2002-08-02  jacob berkman  <jacob@ximian.com>
 
 	* gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index f3e44f6b31..f19e777edc 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -21,6 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include <glib.h>
 #include "gdkscreen.h"
 #include "gdkscreen-x11.h"
@@ -28,6 +29,11 @@
 #include "gdkdisplay-x11.h"
 #include "gdkx.h"
 
+#ifdef HAVE_XFT
+#include <pango/pangoxft.h>
+#endif
+#include <pango/pangox.h>
+
 #ifdef HAVE_SOLARIS_XINERAMA
 #include <X11/extensions/xinerama.h>
 #endif
@@ -232,6 +238,10 @@ gdk_screen_x11_dispose (GObject *object)
 {
   GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (object);
 
+  pango_x_shutdown_display (screen_x11->xdisplay, screen_x11->xscreen);
+#ifdef HAVE_XFT  
+  pango_xft_shutdown_display (screen_x11->xdisplay, screen_x11->xscreen);
+#endif  
   _gdk_x11_events_uninit_screen (GDK_SCREEN (object));
   
   screen_x11->root_window = NULL;