AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Call pango_x[ft]_shutdown_display().

Browse Source 
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().
This commit is contained in:
Owen Taylor 2002-08-02 19:19:42 +00:00 committed by Owen Taylor
parent 184a45caff
commit 64e8303a79
7 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2002-08-02 jacob berkman <jacob@ximian.com>
* gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare * gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare

5
ChangeLog.pre-2-10
View File

@ -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> 2002-08-02 jacob berkman <jacob@ximian.com>
* gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare * gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare

5
ChangeLog.pre-2-2
View File

@ -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> 2002-08-02 jacob berkman <jacob@ximian.com>
* gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare * gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare

5
ChangeLog.pre-2-4
View File

@ -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> 2002-08-02 jacob berkman <jacob@ximian.com>
* gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare * gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare

5
ChangeLog.pre-2-6
View File

@ -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> 2002-08-02 jacob berkman <jacob@ximian.com>
* gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare * gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare

5
ChangeLog.pre-2-8
View File

@ -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> 2002-08-02 jacob berkman <jacob@ximian.com>
* gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare * gdk/x11/gdkscreen-x11.c (check_xfree_xinerama): declare

10
gdk/x11/gdkscreen-x11.c
View File

@ -21,6 +21,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include <config.h>
#include <glib.h> #include <glib.h>
#include "gdkscreen.h" #include "gdkscreen.h"
#include "gdkscreen-x11.h" #include "gdkscreen-x11.h"
@ -28,6 +29,11 @@
#include "gdkdisplay-x11.h" #include "gdkdisplay-x11.h"
#include "gdkx.h" #include "gdkx.h"
#ifdef HAVE_XFT
#include <pango/pangoxft.h>
#endif
#include <pango/pangox.h>
#ifdef HAVE_SOLARIS_XINERAMA #ifdef HAVE_SOLARIS_XINERAMA
#include <X11/extensions/xinerama.h> #include <X11/extensions/xinerama.h>
#endif #endif
@ -232,6 +238,10 @@ gdk_screen_x11_dispose (GObject *object)
{ {
GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (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)); _gdk_x11_events_uninit_screen (GDK_SCREEN (object));
screen_x11->root_window = NULL; screen_x11->root_window = NULL;