Merge lp:~unity-team/unity/unity.launcher-activate-change into lp:unity

[Gord Allott]

changes the logic of the launcher so that it launches the application instead of switching to it if there are no visible windows. helps towards fixing lp:647979 - but it won't fix that until a change is made in bamf to ignore the file copy dialog

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks innocent enough and does as described in the merge request. Approved!

review: Approve

=== modified file 'unity-private/launcher/application-controller.vala'
--- unity-private/launcher/application-controller.vala	2010-09-27 10:42:46 +0000
+++ unity-private/launcher/application-controller.vala	2010-09-27 16:20:59 +0000
@@ -344,6 +344,36 @@
     }
 
 
+    private void launch_desktop_file ()
+    {
+      Gdk.AppLaunchContext context = new Gdk.AppLaunchContext ();
+      try
+        {
+          var appinfo = new DesktopAppInfo.from_filename (desktop_file);
+          context.set_screen (Gdk.Display.get_default ().get_default_screen ());
+          context.set_timestamp (Gdk.CURRENT_TIME);
+
+          appinfo.launch (null, context);
+          child.activating = true;
+          // timeout after eight seconds
+          GLib.Timeout.add_seconds (8, on_launch_timeout);
+        }
+      catch (Error e)
+        {
+          warning (e.message);
+        }
+    }
+
+    private bool app_has_visable_window ()
+      requires (app is Bamf.Application)
+    {
+      foreach (Bamf.Window window in app.get_windows ())
+        {
+          if (window.user_visible ()) return true;
+        }
+      return false;
+    }
+
     public override void activate ()
     {
       if (app is Bamf.Application)
@@ -359,31 +389,20 @@
                   global_shell.expose_xids (xids);
                 }
             }
-          else if (app.is_running ())
+          else if (app.is_running () && app_has_visable_window ())
             {
               unowned List<Bamf.Window> windows = app.get_windows ();
               windows.sort ((CompareFunc)order_app_windows);
               Unity.global_shell.show_window (windows.nth_data (windows.length ()-1).get_xid ());
             }
+          else
+            {
+              launch_desktop_file ();
+            }
         }
       else
         {
-          Gdk.AppLaunchContext context = new Gdk.AppLaunchContext ();
-          try
-            {
-              var appinfo = new DesktopAppInfo.from_filename (desktop_file);
-              context.set_screen (Gdk.Display.get_default ().get_default_screen ());
-              context.set_timestamp (Gdk.CURRENT_TIME);
-
-              appinfo.launch (null, context);
-              child.activating = true;
-              // timeout after eight seconds
-              GLib.Timeout.add_seconds (8, on_launch_timeout);
-            }
-          catch (Error e)
-            {
-              warning (e.message);
-            }
+          launch_desktop_file ();
         }
       global_shell.hide_unity ();
     }