summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--gdk/x11/gdkwindow-x11.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b1d2278f..1b8d1e7ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-03 Matthias Clasen <mclasen@redhat.com>
+
+ Revert the fix for 526635 - it causes segfaults.
+
2008-06-02 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintunixdialog.c: Include gtkmessagedialog.h for
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index fb20d0acf..cc1f6fd7e 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -153,7 +153,7 @@ _gdk_x11_window_get_toplevel (GdkWindow *window)
g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
- if (!WINDOW_IS_TOPLEVEL (window));
+ if (GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD)
return NULL;
private = (GdkWindowObject *)window;