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

Fix args to pango_x_shutdown_display().

Browse Source 
Fri Aug  2 15:56:47 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix
        args to pango_x_shutdown_display().

        * gdk/linux-fb/gdkinput.c gdk/linux-fb/gdkinputprivate.h
        gdk/win32/gdkinput-win32.[ch] gdk/win32/gdkinput.c
        gdk/win32/gdkwindow-win32.c gdk/x11/gdkinput-x11.c
        gdk/x11/gdkinput-xfree.c gdk/x11/gdkinput.c
        gdk/x11/gdkinputprivate.h gdk/x11/gdkwindow-x11.c: Move
        a bunch of functions gdk_input => _gdk_input. Clean
        up some header file cruft. (#79971)
This commit is contained in:
Owen Taylor
2002-08-02 20:22:49 +00:00
committed by Owen Taylor
parent 64e8303a79
commit b7c0c06b8e
18 changed files with 161 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
Fri Aug 2 15:56:47 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix
args to pango_x_shutdown_display().
* gdk/linux-fb/gdkinput.c gdk/linux-fb/gdkinputprivate.h
gdk/win32/gdkinput-win32.[ch] gdk/win32/gdkinput.c
gdk/win32/gdkwindow-win32.c gdk/x11/gdkinput-x11.c
gdk/x11/gdkinput-xfree.c gdk/x11/gdkinput.c
gdk/x11/gdkinputprivate.h gdk/x11/gdkwindow-x11.c: Move
a bunch of functions gdk_input => _gdk_input. Clean
up some header file cruft. (#79971)
Fri Aug 2 12:21:41 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose):

13
ChangeLog.pre-2-10
View File

@ -1,3 +1,16 @@
Fri Aug 2 15:56:47 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix
args to pango_x_shutdown_display().
* gdk/linux-fb/gdkinput.c gdk/linux-fb/gdkinputprivate.h
gdk/win32/gdkinput-win32.[ch] gdk/win32/gdkinput.c
gdk/win32/gdkwindow-win32.c gdk/x11/gdkinput-x11.c
gdk/x11/gdkinput-xfree.c gdk/x11/gdkinput.c
gdk/x11/gdkinputprivate.h gdk/x11/gdkwindow-x11.c: Move
a bunch of functions gdk_input => _gdk_input. Clean
up some header file cruft. (#79971)
Fri Aug 2 12:21:41 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose):

13
ChangeLog.pre-2-2
View File

@ -1,3 +1,16 @@
Fri Aug 2 15:56:47 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix
args to pango_x_shutdown_display().
* gdk/linux-fb/gdkinput.c gdk/linux-fb/gdkinputprivate.h
gdk/win32/gdkinput-win32.[ch] gdk/win32/gdkinput.c
gdk/win32/gdkwindow-win32.c gdk/x11/gdkinput-x11.c
gdk/x11/gdkinput-xfree.c gdk/x11/gdkinput.c
gdk/x11/gdkinputprivate.h gdk/x11/gdkwindow-x11.c: Move
a bunch of functions gdk_input => _gdk_input. Clean
up some header file cruft. (#79971)
Fri Aug 2 12:21:41 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose):

13
ChangeLog.pre-2-4
View File

@ -1,3 +1,16 @@
Fri Aug 2 15:56:47 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix
args to pango_x_shutdown_display().
* gdk/linux-fb/gdkinput.c gdk/linux-fb/gdkinputprivate.h
gdk/win32/gdkinput-win32.[ch] gdk/win32/gdkinput.c
gdk/win32/gdkwindow-win32.c gdk/x11/gdkinput-x11.c
gdk/x11/gdkinput-xfree.c gdk/x11/gdkinput.c
gdk/x11/gdkinputprivate.h gdk/x11/gdkwindow-x11.c: Move
a bunch of functions gdk_input => _gdk_input. Clean
up some header file cruft. (#79971)
Fri Aug 2 12:21:41 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose):

13
ChangeLog.pre-2-6
View File

@ -1,3 +1,16 @@
Fri Aug 2 15:56:47 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix
args to pango_x_shutdown_display().
* gdk/linux-fb/gdkinput.c gdk/linux-fb/gdkinputprivate.h
gdk/win32/gdkinput-win32.[ch] gdk/win32/gdkinput.c
gdk/win32/gdkwindow-win32.c gdk/x11/gdkinput-x11.c
gdk/x11/gdkinput-xfree.c gdk/x11/gdkinput.c
gdk/x11/gdkinputprivate.h gdk/x11/gdkwindow-x11.c: Move
a bunch of functions gdk_input => _gdk_input. Clean
up some header file cruft. (#79971)
Fri Aug 2 12:21:41 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose):

13
ChangeLog.pre-2-8
View File

@ -1,3 +1,16 @@
Fri Aug 2 15:56:47 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix
args to pango_x_shutdown_display().
* gdk/linux-fb/gdkinput.c gdk/linux-fb/gdkinputprivate.h
gdk/win32/gdkinput-win32.[ch] gdk/win32/gdkinput.c
gdk/win32/gdkwindow-win32.c gdk/x11/gdkinput-x11.c
gdk/x11/gdkinput-xfree.c gdk/x11/gdkinput.c
gdk/x11/gdkinputprivate.h gdk/x11/gdkwindow-x11.c: Move
a bunch of functions gdk_input => _gdk_input. Clean
up some header file cruft. (#79971)
Fri Aug 2 12:21:41 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose):

16
gdk/linux-fb/gdkinput.c
View File

@ -215,20 +215,20 @@ gdk_device_set_mode (GdkDevice *device,
}
gint
gdk_input_enable_window (GdkWindow *window, GdkDevicePrivate *gdkdev)
_gdk_input_enable_window (GdkWindow *window, GdkDevicePrivate *gdkdev)
{
return TRUE;
}
gint
gdk_input_disable_window (GdkWindow *window, GdkDevicePrivate *gdkdev)
_gdk_input_disable_window (GdkWindow *window, GdkDevicePrivate *gdkdev)
{
return TRUE;
}
GdkInputWindow *
gdk_input_window_find(GdkWindow *window)
_gdk_input_window_find(GdkWindow *window)
{
GList *tmp_list;
@ -283,7 +283,7 @@ gdk_input_set_extension_events (GdkWindow *window, gint mask,
}
else
{
iw = gdk_input_window_find (window);
iw = _gdk_input_window_find (window);
if (iw)
{
_gdk_input_windows = g_list_remove (_gdk_input_windows,iw);
@ -301,19 +301,19 @@ gdk_input_set_extension_events (GdkWindow *window, gint mask,
{
if (mask != 0 && gdkdev->info.mode != GDK_MODE_DISABLED
&& (gdkdev->info.has_cursor || mode == GDK_EXTENSION_EVENTS_ALL))
gdk_input_enable_window (window,gdkdev);
_gdk_input_enable_window (window,gdkdev);
else
gdk_input_disable_window (window,gdkdev);
_gdk_input_disable_window (window,gdkdev);
}
}
}
void
gdk_input_window_destroy (GdkWindow *window)
_gdk_input_window_destroy (GdkWindow *window)
{
GdkInputWindow *input_window;
input_window = gdk_input_window_find (window);
input_window = _gdk_input_window_find (window);
g_return_if_fail (input_window != NULL);
_gdk_input_windows = g_list_remove (_gdk_input_windows,input_window);

12
gdk/linux-fb/gdkinputprivate.h
View File

@ -137,20 +137,16 @@ extern gint _gdk_input_ignore_core;
/* Function declarations */
GdkDevicePrivate * gdk_input_find_device (guint32 id);
GdkInputWindow * gdk_input_window_find (GdkWindow *window);
void gdk_input_window_destroy (GdkWindow *window);
GdkInputWindow * _gdk_input_window_find (GdkWindow *window);
void _gdk_input_window_destroy (GdkWindow *window);
void _gdk_input_init (void);
void _gdk_input_exit (void);
gint gdk_input_enable_window (GdkWindow *window,
gint _gdk_input_enable_window (GdkWindow *window,
GdkDevicePrivate *gdkdev);
gint gdk_input_disable_window (GdkWindow *window,
gint _gdk_input_disable_window (GdkWindow *window,
GdkDevicePrivate *gdkdev);
void _gdk_init_input_core (void);
GdkDevicePrivate *gdk_input_find_device (guint32 id);
GdkInputWindow *gdk_input_window_find (GdkWindow *window);
void gdk_input_window_destroy (GdkWindow *window);
void _gdk_input_exit (void);
#endif /* __GDK_INPUTPRIVATE_H__ */

8
gdk/win32/gdkinput-win32.c
View File

@ -661,7 +661,7 @@ _gdk_input_configure_event (GdkEventConfigure *event,
GdkInputWindow *input_window;
int root_x, root_y;
input_window = gdk_input_window_find (window);
input_window = _gdk_input_window_find (window);
g_return_if_fail (window != NULL);
gdk_input_get_root_relative_geometry (GDK_WINDOW_HWND (window),
@ -678,7 +678,7 @@ _gdk_input_enter_event (GdkEventCrossing *event,
GdkInputWindow *input_window;
int root_x, root_y;
input_window = gdk_input_window_find (window);
input_window = _gdk_input_window_find (window);
g_return_if_fail (window != NULL);
gdk_input_get_root_relative_geometry (GDK_WINDOW_HWND (window), &root_x, &root_y);
@ -835,7 +835,7 @@ _gdk_input_other_event (GdkEvent *event,
goto dijkstra;
}
input_window = gdk_input_window_find (window);
input_window = _gdk_input_window_find (window);
g_assert (input_window != NULL);
@ -1162,7 +1162,7 @@ gdk_device_get_state (GdkDevice *device,
gdk_window_get_pointer (window, NULL, NULL, mask);
gdkdev = (GdkDevicePrivate *)device;
input_window = gdk_input_window_find (window);
input_window = _gdk_input_window_find (window);
g_return_if_fail (input_window != NULL);
#if 0 /* FIXME */

14
gdk/win32/gdkinput-win32.h
View File

@ -131,7 +131,6 @@ extern gint _gdk_input_ignore_core;
/* Function declarations */
void _gdk_init_input_core (void);
void gdk_input_window_destroy (GdkWindow *window);
GdkTimeCoord ** _gdk_device_allocate_history (GdkDevice *device,
gint n_events);
@ -150,9 +149,9 @@ gint _gdk_input_other_event (GdkEvent *event,
/* These should be in gdkinternals.h */
GdkInputWindow *gdk_input_window_find (GdkWindow *window);
GdkInputWindow *_gdk_input_window_find (GdkWindow *window);
void gdk_input_window_destroy (GdkWindow *window);
void _gdk_input_window_destroy (GdkWindow *window);
gint _gdk_input_enable_window (GdkWindow *window,
GdkDevicePrivate *gdkdev);
@ -171,13 +170,4 @@ gboolean _gdk_device_get_history (GdkDevice *device,
GdkTimeCoord ***events,
gint *n_events);
#define GDK_MAX_DEVICE_CLASSES 13
gint gdk_input_common_init (gint include_core);
gint gdk_input_common_other_event (GdkEvent *event,
MSG *msg,
GdkInputWindow *input_window,
GdkWindow *window);
#endif /* __GDK_INPUT_WIN32_H__ */

8
gdk/win32/gdkinput.c
View File

@ -225,7 +225,7 @@ gdk_device_free_history (GdkTimeCoord **events,
}
GdkInputWindow *
gdk_input_window_find(GdkWindow *window)
_gdk_input_window_find(GdkWindow *window)
{
GList *tmp_list;
@ -282,7 +282,7 @@ gdk_input_set_extension_events (GdkWindow *window, gint mask,
}
else
{
iw = gdk_input_window_find (window);
iw = _gdk_input_window_find (window);
if (iw)
{
_gdk_input_windows = g_list_remove(_gdk_input_windows,iw);
@ -308,11 +308,11 @@ gdk_input_set_extension_events (GdkWindow *window, gint mask,
}
void
gdk_input_window_destroy (GdkWindow *window)
_gdk_input_window_destroy (GdkWindow *window)
{
GdkInputWindow *input_window;
input_window = gdk_input_window_find (window);
input_window = _gdk_input_window_find (window);
g_return_if_fail (input_window != NULL);
_gdk_input_windows = g_list_remove (_gdk_input_windows,input_window);

2
gdk/win32/gdkwindow-win32.c
View File

@ -743,7 +743,7 @@ _gdk_windowing_window_destroy (GdkWindow *window,
GDK_WINDOW_HWND (window)));
if (private->extension_events != 0)
gdk_input_window_destroy (window);
_gdk_input_window_destroy (window);
if (private->window_type == GDK_WINDOW_FOREIGN)
{

20
gdk/x11/gdkinput-x11.c
View File

@ -46,7 +46,7 @@ static guint gdk_input_translate_state (guint stat
guint device_state);
GdkDevicePrivate *
gdk_input_find_device (GdkDisplay *display,
_gdk_input_find_device (GdkDisplay *display,
guint32 id)
{
GList *tmp_list = GDK_DISPLAY_X11 (display)->input_devices;
@ -62,7 +62,7 @@ gdk_input_find_device (GdkDisplay *display,
}
void
gdk_input_get_root_relative_geometry(Display *display, Window w, int *x_ret, int *y_ret,
_gdk_input_get_root_relative_geometry(Display *display, Window w, int *x_ret, int *y_ret,
int *width_ret, int *height_ret)
{
Window root, parent, child;
@ -258,7 +258,7 @@ gdk_input_device_new (GdkDisplay *display,
}
void
gdk_input_common_find_events(GdkWindow *window,
_gdk_input_common_find_events(GdkWindow *window,
GdkDevicePrivate *gdkdev,
gint mask,
XEventClass *classes,
@ -360,16 +360,16 @@ gdk_input_common_find_events(GdkWindow *window,
}
void
gdk_input_common_select_events(GdkWindow *window,
_gdk_input_common_select_events(GdkWindow *window,
GdkDevicePrivate *gdkdev)
{
XEventClass classes[GDK_MAX_DEVICE_CLASSES];
gint num_classes;
if (gdkdev->info.mode == GDK_MODE_DISABLED)
gdk_input_common_find_events(window, gdkdev, 0, classes, &num_classes);
_gdk_input_common_find_events(window, gdkdev, 0, classes, &num_classes);
else
gdk_input_common_find_events(window, gdkdev,
_gdk_input_common_find_events(window, gdkdev,
((GdkWindowObject *)window)->extension_events,
classes, &num_classes);
@ -379,7 +379,7 @@ gdk_input_common_select_events(GdkWindow *window,
}
gint
gdk_input_common_init (GdkDisplay *display,
_gdk_input_common_init (GdkDisplay *display,
gint include_core)
{
char **extensions;
@ -529,7 +529,7 @@ gdk_input_translate_state(guint state, guint device_state)
gint
gdk_input_common_other_event (GdkEvent *event,
_gdk_input_common_other_event (GdkEvent *event,
XEvent *xevent,
GdkInputWindow *input_window,
GdkDevicePrivate *gdkdev)
@ -695,7 +695,7 @@ _gdk_device_get_history (GdkDevice *device,
gint i;
gdkdev = (GdkDevicePrivate *)device;
input_window = gdk_input_window_find (window);
input_window = _gdk_input_window_find (window);
g_return_val_if_fail (input_window != NULL, FALSE);
@ -757,7 +757,7 @@ gdk_device_get_state (GdkDevice *device,
gdk_window_get_pointer (window, NULL, NULL, mask);
gdkdev = (GdkDevicePrivate *)device;
input_window = gdk_input_window_find (window);
input_window = _gdk_input_window_find (window);
g_return_if_fail (input_window != NULL);
state = XQueryDeviceState (GDK_WINDOW_XDISPLAY (window),

22
gdk/x11/gdkinput-xfree.c
View File

@ -36,7 +36,7 @@ _gdk_input_init(GdkDisplay *display)
{
_gdk_init_input_core (display);
GDK_DISPLAY_X11 (display)->input_ignore_core = FALSE;
gdk_input_common_init (display, FALSE);
_gdk_input_common_init (display, FALSE);
}
gboolean
@ -147,10 +147,10 @@ _gdk_input_configure_event (XConfigureEvent *xevent,
GdkInputWindow *input_window;
gint root_x, root_y;
input_window = gdk_input_window_find(window);
input_window = _gdk_input_window_find(window);
g_return_if_fail (window != NULL);
gdk_input_get_root_relative_geometry(GDK_WINDOW_XDISPLAY (window),
_gdk_input_get_root_relative_geometry(GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XWINDOW (window),
&root_x, &root_y, NULL, NULL);
@ -165,12 +165,12 @@ _gdk_input_enter_event (XCrossingEvent *xevent,
GdkInputWindow *input_window;
gint root_x, root_y;
input_window = gdk_input_window_find (window);
input_window = _gdk_input_window_find (window);
g_return_if_fail (window != NULL);
gdk_input_check_proximity(GDK_WINDOW_DISPLAY (window));
gdk_input_get_root_relative_geometry(GDK_WINDOW_XDISPLAY (window),
_gdk_input_get_root_relative_geometry(GDK_WINDOW_XDISPLAY (window),
GDK_WINDOW_XWINDOW(window),
&root_x, &root_y, NULL, NULL);
@ -189,14 +189,14 @@ _gdk_input_other_event (GdkEvent *event,
gint return_val;
GdkDisplayX11 *display_impl = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
input_window = gdk_input_window_find(window);
input_window = _gdk_input_window_find(window);
g_return_val_if_fail (window != NULL, -1);
/* This is a sort of a hack, as there isn't any XDeviceAnyEvent -
but it's potentially faster than scanning through the types of
every device. If we were deceived, then it won't match any of
the types for the device anyways */
gdkdev = gdk_input_find_device (GDK_WINDOW_DISPLAY (window),
gdkdev = _gdk_input_find_device (GDK_WINDOW_DISPLAY (window),
((XDeviceButtonEvent *)xevent)->deviceid);
if (!gdkdev)
return -1; /* we don't handle it - not an XInput event */
@ -211,7 +211,7 @@ _gdk_input_other_event (GdkEvent *event,
if (!display_impl->input_ignore_core)
gdk_input_check_proximity(GDK_WINDOW_DISPLAY (window));
return_val = gdk_input_common_other_event (event, xevent,
return_val = _gdk_input_common_other_event (event, xevent,
input_window, gdkdev);
if (return_val > 0 && event->type == GDK_PROXIMITY_OUT &&
@ -225,14 +225,14 @@ gboolean
_gdk_input_enable_window(GdkWindow *window, GdkDevicePrivate *gdkdev)
{
/* FIXME: watchout, gdkdev might be core pointer, never opened */
gdk_input_common_select_events (window, gdkdev);
_gdk_input_common_select_events (window, gdkdev);
return TRUE;
}
gboolean
_gdk_input_disable_window(GdkWindow *window, GdkDevicePrivate *gdkdev)
{
gdk_input_common_select_events (window, gdkdev);
_gdk_input_common_select_events (window, gdkdev);
return TRUE;
}
@ -281,7 +281,7 @@ _gdk_input_grab_pointer (GdkWindow * window,
gdkdev = (GdkDevicePrivate *)tmp_list->data;
if (!GDK_IS_CORE (gdkdev) && gdkdev->xdevice)
{
gdk_input_common_find_events (window, gdkdev,
_gdk_input_common_find_events (window, gdkdev,
event_mask,
event_classes, &num_classes);
#ifdef G_ENABLE_DEBUG

8
gdk/x11/gdkinput.c
View File

@ -271,7 +271,7 @@ gdk_device_free_history (GdkTimeCoord **events,
}
GdkInputWindow *
gdk_input_window_find(GdkWindow *window)
_gdk_input_window_find(GdkWindow *window)
{
GList *tmp_list;
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
@ -331,7 +331,7 @@ gdk_input_set_extension_events (GdkWindow *window, gint mask,
}
else
{
iw = gdk_input_window_find (window);
iw = _gdk_input_window_find (window);
if (iw)
{
display_x11->input_windows = g_list_remove(display_x11->input_windows,iw);
@ -357,12 +357,12 @@ gdk_input_set_extension_events (GdkWindow *window, gint mask,
}
void
gdk_input_window_destroy (GdkWindow *window)
_gdk_input_window_destroy (GdkWindow *window)
{
GdkInputWindow *input_window;
GdkDisplayX11 *display_x11 = GDK_DISPLAY_X11 (GDK_WINDOW_DISPLAY (window));
input_window = gdk_input_window_find (window);
input_window = _gdk_input_window_find (window);
g_return_if_fail (input_window != NULL);
display_x11->input_windows = g_list_remove (display_x11->input_windows, input_window);

16
gdk/x11/gdkinputprivate.h
View File

@ -130,8 +130,8 @@ struct _GdkInputWindow
/* Function declarations */
GdkInputWindow *gdk_input_window_find (GdkWindow *window);
void gdk_input_window_destroy (GdkWindow *window);
GdkInputWindow *_gdk_input_window_find (GdkWindow *window);
void _gdk_input_window_destroy (GdkWindow *window);
GdkTimeCoord ** _gdk_device_allocate_history (GdkDevice *device,
gint n_events);
void _gdk_init_input_core (GdkDisplay *display);
@ -170,24 +170,24 @@ gboolean _gdk_device_get_history (GdkDevice *device,
#define GDK_MAX_DEVICE_CLASSES 13
gint gdk_input_common_init (GdkDisplay *display,
gint _gdk_input_common_init (GdkDisplay *display,
gint include_core);
GdkDevicePrivate * gdk_input_find_device (GdkDisplay *display,
GdkDevicePrivate * _gdk_input_find_device (GdkDisplay *display,
guint32 id);
void gdk_input_get_root_relative_geometry (Display *display,
void _gdk_input_get_root_relative_geometry(Display *display,
Window w,
int *x_ret,
int *y_ret,
int *width_ret,
int *height_ret);
void gdk_input_common_find_events (GdkWindow *window,
void _gdk_input_common_find_events (GdkWindow *window,
GdkDevicePrivate *gdkdev,
gint mask,
XEventClass *classes,
int *num_classes);
void gdk_input_common_select_events (GdkWindow *window,
void _gdk_input_common_select_events (GdkWindow *window,
GdkDevicePrivate *gdkdev);
gint gdk_input_common_other_event (GdkEvent *event,
gint _gdk_input_common_other_event (GdkEvent *event,
XEvent *xevent,
GdkInputWindow *input_window,
GdkDevicePrivate *gdkdev);

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

@ -238,9 +238,9 @@ gdk_screen_x11_dispose (GObject *object)
{
GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (object);
pango_x_shutdown_display (screen_x11->xdisplay, screen_x11->xscreen);
pango_x_shutdown_display (screen_x11->xdisplay);
#ifdef HAVE_XFT
pango_xft_shutdown_display (screen_x11->xdisplay, screen_x11->xscreen);
pango_xft_shutdown_display (screen_x11->xdisplay, screen_x11->screen_num);
#endif
_gdk_x11_events_uninit_screen (GDK_SCREEN (object));

2
gdk/x11/gdkwindow-x11.c
View File

@ -814,7 +814,7 @@ _gdk_windowing_window_destroy (GdkWindow *window,
_gdk_selection_window_destroyed (window);
if (private->extension_events != 0)
gdk_input_window_destroy (window);
_gdk_input_window_destroy (window);
#ifdef HAVE_XFT
{