diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/window-props.c | 4 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,13 @@ +2007-11-09 Federico Mena Quintero <federico@novell.com> + + Merged from trunk: + + * src/window-props.c (reload_net_wm_user_time_window): Fix typo; + the arguments to meta_window_reload_property_from_xwindow() were + reversed. This is why the wm_user_time wasn't getting initialized + properly from the _NET_WM_USER_TIME_WINDOW. Fixes part of + http://bugzilla.gnome.org/show_bug.cgi?id=488468 + 2007-10-28 Owen Taylor <otaylor@redhat.com> * src/window.c (meta_window_new_with_attrs): Don't immediately diff --git a/src/window-props.c b/src/window-props.c index 3602395a..48c5371d 100644 --- a/src/window-props.c +++ b/src/window-props.c @@ -278,8 +278,8 @@ reload_net_wm_user_time_window (MetaWindow *window, */ meta_window_reload_property_from_xwindow ( window, - window->display->atom_net_wm_user_time, - window->user_time_window); + window->user_time_window, + window->display->atom_net_wm_user_time); } } } |