diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-06-03 04:39:12 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-06-03 04:39:12 +0000 |
| commit | 15d107a2f1b756141945aee6d5dcc3863dd44978 (patch) | |
| tree | e3e83b148a193ac42b8eea8747bb9ef067ed99d4 | |
| parent | 27d8a1f312b7eeb92f5a736606e0dee45832b416 (diff) | |
| download | gdk-pixbuf-15d107a2f1b756141945aee6d5dcc3863dd44978.tar.gz | |
Revert one problematic fix
svn path=/branches/gtk-2-12/; revision=20297
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -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; |