Merge lp:~unity-team/unity/restore-foce-activate into lp:unity

[Jason Smith]

Restores previous function changed to timeout. 30 minutes of testing could not reproduce the expected crash, it is presumed dead.

[Mirco Müller (macslow)]

Approved.

review: Approve

=== modified file 'targets/mutter/window-management.vala'
--- targets/mutter/window-management.vala	2010-09-16 20:21:40 +0000
+++ targets/mutter/window-management.vala	2010-09-22 04:14:00 +0000
@@ -133,6 +133,21 @@
       window.hide ();
       this.plugin.plugin.minimize_completed (window);
     }
+    
+    private bool force_activate ()
+    {
+      if (this.last_mapped is Mutter.Window)
+        {
+          unowned Mutter.MetaWindow w = this.last_mapped.get_meta_window ();
+          unowned Mutter.MetaDisplay d = Mutter.MetaWindow.get_display (w);
+
+          Mutter.MetaWindow.activate (this.last_mapped.get_meta_window (),
+                                      Mutter.MetaDisplay.get_current_time (d));
+        }
+
+      return false;
+    }
+
 
     private void window_mapped (Plugin plugin, Mutter.Window window)
     {
@@ -155,6 +170,7 @@
                                       Mutter.MetaWindow.get_user_time (
                                             window.get_meta_window ()));
           this.last_mapped = window;
+          Timeout.add (0, this.force_activate);
         }
 
       Clutter.Animation anim = null;