gtk+ r20063 - in branches/gtk-2-12: . gdk/quartz
- From: rhult svn gnome org
- To: svn-commits-list gnome org
- Subject: gtk+ r20063 - in branches/gtk-2-12: . gdk/quartz
- Date: Thu, 1 May 2008 20:14:19 +0100 (BST)
Author: rhult
Date: Thu May 1 19:14:18 2008
New Revision: 20063
URL: http://svn.gnome.org/viewvc/gtk+?rev=20063&view=rev
Log:
2008-05-01 Richard Hult <richard imendio com>
Merged from trunk:
* gdk/quartz/gdkevents-quartz.c: (_gdk_events_queue): Don't send
nsevents with the gdk lock held, fixes deadlock when doing manual
window resizing with threading enabled.
Modified:
branches/gtk-2-12/ChangeLog
branches/gtk-2-12/gdk/quartz/gdkevents-quartz.c
Modified: branches/gtk-2-12/gdk/quartz/gdkevents-quartz.c
==============================================================================
--- branches/gtk-2-12/gdk/quartz/gdkevents-quartz.c (original)
+++ branches/gtk-2-12/gdk/quartz/gdkevents-quartz.c Thu May 1 19:14:18 2008
@@ -1938,7 +1938,11 @@
if (event)
{
if (!gdk_event_translate (event))
- [NSApp sendEvent:event];
+ {
+ GDK_THREADS_LEAVE ();
+ [NSApp sendEvent:event];
+ GDK_THREADS_ENTER ();
+ }
_gdk_quartz_event_loop_release_event (event);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]