[mutter] window: Kill off a now-unnecessary state variable
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] window: Kill off a now-unnecessary state variable
- Date: Wed, 13 Aug 2014 23:04:13 +0000 (UTC)
commit 879407c10c517ff7d20ed7e86af72ffcadaa5906
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Aug 13 18:23:22 2014 -0400
window: Kill off a now-unnecessary state variable
src/core/window-private.h | 3 ---
src/core/window.c | 1 -
src/x11/window-props.c | 8 ++------
3 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 3c75dd1..ee014ac 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -329,9 +329,6 @@ struct _MetaWindow
*/
guint calc_placement : 1;
- /* Transient parent is a root window */
- guint transient_parent_is_root_window : 1;
-
/* if TRUE, window was maximized at start of current grab op */
guint shaken_loose : 1;
diff --git a/src/core/window.c b/src/core/window.c
index 1dbd120..2a45f95 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -933,7 +933,6 @@ _meta_window_shared_new (MetaDisplay *display,
window->xtransient_for = None;
window->xclient_leader = None;
- window->transient_parent_is_root_window = FALSE;
window->type = META_WINDOW_NORMAL;
diff --git a/src/x11/window-props.c b/src/x11/window-props.c
index b76f6de..79cc890 100644
--- a/src/x11/window-props.c
+++ b/src/x11/window-props.c
@@ -1604,16 +1604,12 @@ reload_transient_for (MetaWindow *window,
window->xtransient_for = transient_for;
- window->transient_parent_is_root_window =
- window->xtransient_for == window->screen->xroot;
-
if (window->xtransient_for != None)
- meta_verbose ("Window %s transient for 0x%lx (root = %d)\n", window->desc,
- window->xtransient_for, window->transient_parent_is_root_window);
+ meta_verbose ("Window %s transient for 0x%lx\n", window->desc, window->xtransient_for);
else
meta_verbose ("Window %s is not transient\n", window->desc);
- if (window->transient_parent_is_root_window || window->xtransient_for == None)
+ if (window->xtransient_for == None || window->xtransient_for == window->screen->xroot)
meta_window_set_transient_for (window, NULL);
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]