diff options
| author | Alberts Muktupāvels <[email protected]> | 2015-07-21 03:14:33 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-09-14 18:54:03 +0200 |
| commit | 49d830417d9ef75241eb63d6d08a51603cfda18f (patch) | |
| tree | aa1126a0c3ab765093a927198f1f51fedd3bc986 /src/core/window.c | |
| parent | ee8de316b3e0ff382d41012e78edf5bc58895f54 (diff) | |
| download | marco-49d830417d9ef75241eb63d6d08a51603cfda18f.tar.bz2 marco-49d830417d9ef75241eb63d6d08a51603cfda18f.tar.xz | |
window: load NET_WM_USER_TIME from the right window
On subsequent changes, if there is a NET_WM_USER_TIME_WINDOW, then
read the property from that rather than from the main window.
(Fix an accidental regression: the right Window was being computed
but no longer passed in.)
Original patch author - Owen Taylor:
https://bugzilla.gnome.org/show_bug.cgi?id=585979
Diffstat (limited to 'src/core/window.c')
| -rw-r--r-- | src/core/window.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/window.c b/src/core/window.c index 9e780390..60616e4d 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -5585,6 +5585,8 @@ static gboolean process_property_notify (MetaWindow *window, XPropertyEvent *event) { + Window xid = window->xwindow; + if (meta_is_verbose ()) /* avoid looking up the name if we don't have to */ { char *property_name = XGetAtomName (window->display->xdisplay, @@ -5595,7 +5597,13 @@ process_property_notify (MetaWindow *window, XFree (property_name); } - meta_window_reload_property (window, event->atom, FALSE); + if (event->atom == window->display->atom__NET_WM_USER_TIME && + window->user_time_window) + { + xid = window->user_time_window; + } + + meta_window_reload_property_from_xwindow (window, xid, event->atom, FALSE); return TRUE; } |