[metacity] window: load NET_WM_USER_TIME from the right window
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] window: load NET_WM_USER_TIME from the right window
- Date: Wed, 18 Feb 2015 20:50:52 +0000 (UTC)
commit 98e1c7f1ac4891ec1b25f2739206527ca358a3df
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Wed Feb 18 22:46:36 2015 +0200
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
This patch also reverts some code removal from this metacity commit:
be478298219d2207c8e7a5ba79f20485afe24b70
https://bugzilla.gnome.org/show_bug.cgi?id=587425
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 20173a0..66af415 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -5676,6 +5676,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,
@@ -5686,7 +5688,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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]