diff options
| author | Federico Mena Quintero <federico@novell.com> | 2007-11-09 19:37:10 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2007-11-09 19:37:10 +0000 |
| commit | 54d6a293bb9c29585501066005dba120562cb3e1 (patch) | |
| tree | cf47f5e5280b3e3868ce061a3a319267595c1819 | |
| parent | 26000d1cf8da4636ac092f050bd4adcf523c3c0e (diff) | |
| download | metacity-54d6a293bb9c29585501066005dba120562cb3e1.tar.gz | |
Fix reversed arguments when updating _NET_WM_USER_TIME
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
Signed-off-by: Federico Mena Quintero <federico@gnu.org>
svn path=/branches/gnome-2-20/; revision=3380
| -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); } } } |