diff options
| author | Richard Hult <richard@imendio.com> | 2008-05-01 19:14:18 +0000 |
|---|---|---|
| committer | Richard Hult <rhult@src.gnome.org> | 2008-05-01 19:14:18 +0000 |
| commit | b03345022ad28cbe97ef2b09712750490ecac573 (patch) | |
| tree | eacfa31abbc975eda587222489e5bee9ed9418e4 | |
| parent | 03d6aa295c6ee415a99790891a9f336990fc20c6 (diff) | |
| download | gdk-pixbuf-b03345022ad28cbe97ef2b09712750490ecac573.tar.gz | |
Merged from trunk:
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.
svn path=/branches/gtk-2-12/; revision=20063
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gdk/quartz/gdkevents-quartz.c | 6 |
2 files changed, 13 insertions, 1 deletions
@@ -2,6 +2,14 @@ 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. + +2008-05-01 Richard Hult <richard@imendio.com> + + Merged from trunk: + * gdk/quartz/gdkevents-quartz.c: (get_keyboard_modifiers_from_ns_event), (create_key_event): Map Alt to Alt and Cmd to Meta. This is not only more logical but also diff --git a/gdk/quartz/gdkevents-quartz.c b/gdk/quartz/gdkevents-quartz.c index 11ac5df74..985577d61 100644 --- a/gdk/quartz/gdkevents-quartz.c +++ b/gdk/quartz/gdkevents-quartz.c @@ -1938,7 +1938,11 @@ _gdk_events_queue (GdkDisplay *display) 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); } |