diff options
author | Owen Taylor <otaylor@redhat.com> | 2001-04-18 18:28:19 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2001-04-18 18:28:19 +0000 |
commit | 6cff7051b16d99178c5320592e96c757597835e4 (patch) | |
tree | 6aabc47ef5228d44c3a95b3a55cee06281200ac7 /gdk/gdkwindow.c | |
parent | 60b6a010e931aaaf97d723c893068381a421f0a0 (diff) | |
download | gdk-pixbuf-6cff7051b16d99178c5320592e96c757597835e4.tar.gz |
Try changing mode on shm segments to 0600. We'll see who complains.
Wed Apr 18 14:23:14 2001 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkimage-x11.c (gdk_image_new): Try changing
mode on shm segments to 0600. We'll see who complains.
* gdk/gdkwindow.c (_gdk_window_destroy_hierarchy): Call
_gdk_windowing_window_destroy() AFTER recursing through
children.
* tests/Makefile.am (noinst_PROGRAMS): Build testsocket,
testsocket_child on X.
* tests/testsocket[_child].c: Fix uses of
gtk_window_get_default_accel_group().
[ Merge patch from Ramiro Estrugo <ramiro@eazel.com> from gtk-1-2 ]
* gdk/gdkimage.c: (gdk_image_get):
Deal with the possibility that XGetImage() might return NULL.
Allocate the GdkImagePrivate structure only after XGetImage()
succeeds in order not to dereference a NULL ximage pointer. This
prevents a core dump when XGetImage() fails - which is unlikely,
but can happen due to race conditions accessing the geometries of
drawables. An x error will still be triggered, but the gdk image
wrapper at least wont seg fault.
Diffstat (limited to 'gdk/gdkwindow.c')
-rw-r--r-- | gdk/gdkwindow.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 1e6ec4bce..37b3354d0 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -295,8 +295,6 @@ _gdk_window_destroy_hierarchy (GdkWindow *window, private->state |= GDK_WINDOW_STATE_WITHDRAWN; private->destroyed = TRUE; - _gdk_windowing_window_destroy (window, recursing, foreign_destroy); - if (private->parent) { GdkWindowObject *parent_private = (GdkWindowObject *)private->parent; @@ -333,6 +331,8 @@ _gdk_window_destroy_hierarchy (GdkWindow *window, g_list_free (children); } + _gdk_windowing_window_destroy (window, recursing, foreign_destroy); + if (private->filters) { tmp = private->filters; |