From a5f17908284f928d05b45fa0c5fc9e6c95643f39 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 18 Mar 2014 13:53:42 -0400 Subject: [PATCH] window: Rename wm_hints_urgent to urgent The flag and setter is now decoupled from the WM_HINTS state. --- src/core/window-private.h | 4 ++-- src/core/window.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/core/window-private.h b/src/core/window-private.h index f463360c8..e2751e5ba 100644 --- a/src/core/window-private.h +++ b/src/core/window-private.h @@ -159,8 +159,8 @@ struct _MetaWindow /* Whether we're fullscreen */ guint fullscreen : 1; - /* Whether the urgent flag of WM_HINTS is set */ - guint wm_hints_urgent : 1; + /* Whether the window is marked as urgent */ + guint urgent : 1; /* Whether we have to fullscreen after placement */ guint fullscreen_after_placement : 1; diff --git a/src/core/window.c b/src/core/window.c index 496226506..59ddab1f4 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -306,7 +306,7 @@ meta_window_get_property(GObject *object, g_value_set_boolean (value, win->wm_state_demands_attention); break; case PROP_URGENT: - g_value_set_boolean (value, win->wm_hints_urgent); + g_value_set_boolean (value, win->urgent); break; case PROP_SKIP_TASKBAR: g_value_set_boolean (value, win->skip_taskbar); @@ -833,7 +833,6 @@ _meta_window_shared_new (MetaDisplay *display, meta_icon_cache_init (&window->icon_cache); window->wm_hints_pixmap = None; window->wm_hints_mask = None; - window->wm_hints_urgent = FALSE; window->frame = NULL; window->has_focus = FALSE; @@ -10378,10 +10377,10 @@ void meta_window_set_urgent (MetaWindow *window, gboolean urgent) { - if (window->wm_hints_urgent == urgent) + if (window->urgent == urgent) return; - window->wm_hints_urgent = urgent; + window->urgent = urgent; g_object_notify_by_pspec (window, props[PROP_URGENT]); if (urgent)