[mutter/wayland] window: Use window-props interface to load role/net_wm_type on init

[Jasper St. Pierre <jstpierre src gnome org>]

commit ff89f1e271e861b4df59372b8d9a6fad547891af
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Thu Jan 23 17:10:23 2014 -0500

    window: Use window-props interface to load role/net_wm_type on init

 src/core/window-props.c |    4 ++--
 src/core/window.c       |    9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/src/core/window-props.c b/src/core/window-props.c
index a9145ee..6e07d6e 100644
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -1764,8 +1764,8 @@ meta_display_init_window_prop_hooks (MetaDisplay *display)
     { display->atom__NET_WM_ICON_GEOMETRY, META_PROP_VALUE_CARDINAL_LIST, reload_icon_geometry,     FALSE, 
FALSE },
     { display->atom_WM_CLIENT_LEADER,  META_PROP_VALUE_INVALID, complain_about_broken_client, FALSE, FALSE },
     { display->atom_SM_CLIENT_ID,      META_PROP_VALUE_INVALID, complain_about_broken_client, FALSE, FALSE },
-    { display->atom_WM_WINDOW_ROLE,    META_PROP_VALUE_INVALID, reload_wm_window_role,        FALSE, FALSE },
-    { display->atom__NET_WM_WINDOW_TYPE, META_PROP_VALUE_INVALID, reload_net_wm_window_type,  FALSE, TRUE },
+    { display->atom_WM_WINDOW_ROLE,    META_PROP_VALUE_INVALID, reload_wm_window_role,         TRUE, FALSE },
+    { display->atom__NET_WM_WINDOW_TYPE, META_PROP_VALUE_INVALID, reload_net_wm_window_type,  TRUE, TRUE },
     { display->atom__NET_WM_STRUT,         META_PROP_VALUE_INVALID, reload_struts,            FALSE, FALSE },
     { display->atom__NET_WM_STRUT_PARTIAL, META_PROP_VALUE_INVALID, reload_struts,            FALSE, FALSE },
     { display->atom__NET_WM_BYPASS_COMPOSITOR, META_PROP_VALUE_CARDINAL,  reload_bypass_compositor, FALSE, 
FALSE },
diff --git a/src/core/window.c b/src/core/window.c
index ad8f67d..e1455d2 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1060,14 +1060,7 @@ meta_window_new_shared (MetaDisplay         *display,
 
   if (!window->override_redirect &&
       client_type == META_WINDOW_CLIENT_TYPE_X11)
-    {
-      update_sm_hints (window); /* must come after transient_for */
-
-      meta_window_update_role (window);
-    }
-
-  if (client_type == META_WINDOW_CLIENT_TYPE_X11)
-    meta_window_update_net_wm_type (window);
+    update_sm_hints (window); /* must come after transient_for */
 
   if (!window->override_redirect)
     meta_window_update_icon_now (window);