callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove explicit calls to pango_x/xft_shutdown_display() since Pango now

Browse Source 
Thu Aug  8 23:26:05 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
        explicit calls to pango_x/xft_shutdown_display() since
        Pango now does it by itself on XCloseDisplay().
This commit is contained in:
Owen Taylor
2002-08-09 03:57:02 +00:00
committed by Owen Taylor
parent 1ed63ae04a
commit 46d2f38b8d
8 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Aug 8 23:26:05 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
explicit calls to pango_x/xft_shutdown_display() since
Pango now does it by itself on XCloseDisplay().
Thu Aug 8 21:53:16 2002 Owen Taylor <otaylor@redhat.com> Thu Aug 8 21:53:16 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Consistently order pangoxft / pangox * configure.in: Consistently order pangoxft / pangox

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Thu Aug 8 23:26:05 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
explicit calls to pango_x/xft_shutdown_display() since
Pango now does it by itself on XCloseDisplay().
Thu Aug 8 21:53:16 2002 Owen Taylor <otaylor@redhat.com> Thu Aug 8 21:53:16 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Consistently order pangoxft / pangox * configure.in: Consistently order pangoxft / pangox

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Thu Aug 8 23:26:05 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
explicit calls to pango_x/xft_shutdown_display() since
Pango now does it by itself on XCloseDisplay().
Thu Aug 8 21:53:16 2002 Owen Taylor <otaylor@redhat.com> Thu Aug 8 21:53:16 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Consistently order pangoxft / pangox * configure.in: Consistently order pangoxft / pangox

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Thu Aug 8 23:26:05 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
explicit calls to pango_x/xft_shutdown_display() since
Pango now does it by itself on XCloseDisplay().
Thu Aug 8 21:53:16 2002 Owen Taylor <otaylor@redhat.com> Thu Aug 8 21:53:16 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Consistently order pangoxft / pangox * configure.in: Consistently order pangoxft / pangox

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Thu Aug 8 23:26:05 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
explicit calls to pango_x/xft_shutdown_display() since
Pango now does it by itself on XCloseDisplay().
Thu Aug 8 21:53:16 2002 Owen Taylor <otaylor@redhat.com> Thu Aug 8 21:53:16 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Consistently order pangoxft / pangox * configure.in: Consistently order pangoxft / pangox

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Thu Aug 8 23:26:05 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
explicit calls to pango_x/xft_shutdown_display() since
Pango now does it by itself on XCloseDisplay().
Thu Aug 8 21:53:16 2002 Owen Taylor <otaylor@redhat.com> Thu Aug 8 21:53:16 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Consistently order pangoxft / pangox * configure.in: Consistently order pangoxft / pangox

1
gdk/x11/gdkmain-x11.c
View File

@ -494,7 +494,6 @@ _gdk_windowing_exit (void)
while (tmp_list) while (tmp_list)
{ {
pango_x_shutdown_display (GDK_DISPLAY_XDISPLAY (tmp_list->data));
XCloseDisplay (GDK_DISPLAY_XDISPLAY (tmp_list->data)); XCloseDisplay (GDK_DISPLAY_XDISPLAY (tmp_list->data));
tmp_list = tmp_list->next; tmp_list = tmp_list->next;

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

@ -238,10 +238,6 @@ 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);
#ifdef HAVE_XFT
pango_xft_shutdown_display (screen_x11->xdisplay, screen_x11->screen_num);
#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;