summaryrefslogtreecommitdiff
path: root/src/netwm.c
diff options
context:
space:
mode:
authorOlivier Fourdan <fourdan.olivier@wanadoo.fr>2009-03-13 10:28:32 +0000
committerOlivier Fourdan <fourdan.olivier@wanadoo.fr>2009-03-13 10:28:32 +0000
commitcb304224a6fda01d853e5b8076884c5b42d8975b (patch)
tree9ed9324a43e553d6df7727a8fb4c11485a5d6a7d /src/netwm.c
parent7658cbc0177e14f78ce4e7122be58cab67d8f66f (diff)
downloadxfwm4-cb304224a6fda01d853e5b8076884c5b42d8975b.tar.gz
* src/focus.c, serc/netwm.c: Check for nil timestamp regardless of
focus stealing prevention setting, so that applications using gtk_window_set_focus_on_map() don't get focused even when focus stealing prevention is disabled (Bug #5044) (Old svn revision: 29657)
Diffstat (limited to 'src/netwm.c')
-rw-r--r--src/netwm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/netwm.c b/src/netwm.c
index a5dd3ddb0..7fb91de5e 100644
--- a/src/netwm.c
+++ b/src/netwm.c
@@ -1465,9 +1465,12 @@ clientGetUserTime (Client * c)
* NET_WM_USER_TIME_WINDOW
*/
- if (getNetWMUserTime (display_info, c->user_time_win, &c->user_time) && (c->user_time != 0))
+ if (getNetWMUserTime (display_info, c->user_time_win, &c->user_time))
{
- myDisplaySetLastUserTime (display_info, c->user_time);
+ if (c->user_time != 0)
+ {
+ myDisplaySetLastUserTime (display_info, c->user_time);
+ }
FLAG_SET (c->flags, CLIENT_FLAG_HAS_USER_TIME);
return TRUE;