Release the pool in all cases. (move_resize_window_internal): Surround by

2006-07-09  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c (gdk_window_new): Release the pool
	in all cases.
	(move_resize_window_internal): Surround by alloc/release pool.
	Patch from Brian Tarricone, fixes bug #347018.

diff --git a/ChangeLog b/ChangeLog
index 2c43ab31e2ddf0aaf93f4aa071fa9e839f49fdc7..2c72807cbbdf2ade51fd90cd5e3a8bd20bfb7f1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-09  Richard Hult  <richard@imendio.com>                                                            
+
+       * gdk/quartz/gdkwindow-quartz.c (gdk_window_new): Release the pool
+       in all cases.
+       (move_resize_window_internal): Surround by alloc/release pool.
+       Patch from Brian Tarricone, fixes bug #347018.
+
 2006-07-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserbutton.c (update_label_and_image): Don't

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2c43ab31e2ddf0aaf93f4aa071fa9e839f49fdc7..2c72807cbbdf2ade51fd90cd5e3a8bd20bfb7f1c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2006-07-09  Richard Hult  <richard@imendio.com>                                                            
+
+       * gdk/quartz/gdkwindow-quartz.c (gdk_window_new): Release the pool
+       in all cases.
+       (move_resize_window_internal): Surround by alloc/release pool.
+       Patch from Brian Tarricone, fixes bug #347018.
+
 2006-07-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserbutton.c (update_label_and_image): Don't

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 536dc1678fb94e4b6d71ec005c13ebcc6a0aa1b1..3023e379fd603e9cf3111e4168cc08f2412f8367 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -370,6 +370,7 @@ gdk_window_new (GdkWindow     *parent,
       break;
     default:
       g_warning (G_STRLOC "cannot make windows of type %d", private->window_type);
+      GDK_QUARTZ_RELEASE_POOL;
       return NULL;
     }
 
@@ -659,8 +660,13 @@ move_resize_window_internal (GdkWindow *window,
   GdkWindowObject *private = (GdkWindowObject *)window;
   GdkWindowImplQuartz *impl;
 
+  GDK_QUARTZ_ALLOC_POOL;
+
   if (GDK_WINDOW_DESTROYED (window))
-    return;
+    {
+      GDK_QUARTZ_RELEASE_POOL;
+      return;
+    }
 
   impl = GDK_WINDOW_IMPL_QUARTZ (private->impl);
 
@@ -698,6 +704,8 @@ move_resize_window_internal (GdkWindow *window,
          [impl->view setNeedsDisplay:YES];
        }
     }
+
+  GDK_QUARTZ_RELEASE_POOL;
 }
 
 void