Merge branch 'fix-stacking' into clutter

src/include/compositor-mutter.h

@@ -65,6 +65,7 @@ MetaWindow *       mutter_window_get_meta_window      (MutterWindow *mcw);
 ClutterActor *     mutter_window_get_texture          (MutterWindow *mcw);
 gboolean           mutter_window_is_override_redirect (MutterWindow *mcw);
 const char *       mutter_window_get_description      (MutterWindow *mcw);
+gboolean       mutter_window_showing_on_its_workspace (MutterWindow *mcw);
 
 /* Compositor API */
 MetaCompositor *mutter_new (MetaDisplay *display);

src/include/compositor.h

@@ -129,9 +129,9 @@ meta_compositor_switch_workspace (MetaCompositor     *compositor,
                                   MetaMotionDirection direction);
 
 void
-meta_compositor_ensure_stack_order (MetaCompositor *compositor,
-                                    MetaScreen     *screen);
-
+meta_compositor_sync_stack (MetaCompositor  *compositor,
+			    MetaScreen      *screen,
+			    GList	    *stack);
 #endif
 
 

src/include/window.h

@@ -64,5 +64,8 @@ void     meta_window_activate_with_workspace (MetaWindow    *window,
                                               guint32        current_time,
                                               MetaWorkspace *workspace);
 const char * meta_window_get_description (MetaWindow *window);
+/* Return whether the window would be showing if we were on its workspace */
+gboolean    meta_window_showing_on_its_workspace (MetaWindow *window);
+
 
 #endif