diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-09-29 10:56:05 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-09-29 10:56:05 (GMT) |
| commit | 17c17adbd706d32723ecedeb207c7e467f9fa8eb (patch) | |
| tree | 22d6d314dc7320d0b728578a734d636a1d74d9ae /src/gui/kernel/qguieventdispatcher_glib.cpp | |
| parent | 1ff83d2b44fe07d1bc6b243fad270dfa7d860dc7 (diff) | |
| parent | dcd185e58face87105f484e98ecb195af0790a22 (diff) | |
| download | Qt-17c17adbd706d32723ecedeb207c7e467f9fa8eb.zip Qt-17c17adbd706d32723ecedeb207c7e467f9fa8eb.tar.gz Qt-17c17adbd706d32723ecedeb207c7e467f9fa8eb.tar.bz2 | |
Merge commit 'qt/4.6' into mmfphonon
Diffstat (limited to 'src/gui/kernel/qguieventdispatcher_glib.cpp')
| -rw-r--r-- | src/gui/kernel/qguieventdispatcher_glib.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qguieventdispatcher_glib.cpp b/src/gui/kernel/qguieventdispatcher_glib.cpp index 6e98428..f8a638c 100644 --- a/src/gui/kernel/qguieventdispatcher_glib.cpp +++ b/src/gui/kernel/qguieventdispatcher_glib.cpp @@ -120,7 +120,7 @@ static gboolean x11EventSourceDispatch(GSource *s, GSourceFunc callback, gpointe // _qt_scrolldone protocols, queue all other // client messages if (event.xclient.format == 32) { - if (event.xclient.message_type == ATOM(WM_PROTOCOLS) || + if (event.xclient.message_type == ATOM(WM_PROTOCOLS) && (Atom) event.xclient.data.l[0] == ATOM(WM_TAKE_FOCUS)) { break; } else if (event.xclient.message_type == ATOM(_QT_SCROLL_DONE)) { |