Merge lp:~ted/hud/bamf-focus-fix into lp:hud/13.10

[Ted Gould]

Don't clear the last focused pointer when we get a NULL new window

The new BAMF changed it's behavior slightly in that it always gives us two events. One for clearing the previous window and one for the new window. This caused us to loose the last focused window and then show no results.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:276
http://jenkins.qa.ubuntu.com/job/hud-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-saucy-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins:8080/job/hud-ci/56/rebuild

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

you just got to love BAMF! :)

review: Approve

=== modified file 'src/application-list.c'
--- src/application-list.c	2013-05-21 01:03:09 +0000
+++ src/application-list.c	2013-06-10 20:13:29 +0000
@@ -365,12 +365,6 @@
 {
 	HudApplicationList * list = HUD_APPLICATION_LIST(user_data);
 
-	/* We care where we're going, not where we've been */
-	if (new_win == NULL) {
-		g_clear_object(&list->priv->last_focused_main_stage_source);
-		return;
-	}
-
 	if (hud_application_list_name_in_ignore_list (new_win))
 	    return;
 
@@ -570,21 +564,26 @@
 
 	HudApplicationSource * source = NULL;
 
-#ifdef HAVE_BAMF
-	AbstractApplication * app = NULL;
-	app = bamf_matcher_get_active_application(list->priv->matcher);
-
-	if (app != NULL) {
-		source = bamf_app_to_source(list, app);
-	}
-#endif
-
-#ifdef HAVE_PLATFORM_API
-	/* Hybris doesn't allow us to query what is currently focused,
-	   we'll just have to hope we've tracked it perfectly.  Hopefully
-	   there are no races in the API, we can't protect ourselves against
-	   them in any way. */
+	/* First see if we've already got it */
 	source = list->priv->last_focused_main_stage_source;
+
+#ifdef HAVE_PLATFORM_API
+	/* Check the side stage */
+	if (source == NULL) {
+		source = list->priv->last_focused_side_stage_source;
+	}
+#endif
+
+#ifdef HAVE_BAMF
+	if (source == NULL) {
+		/* Try using the application first */
+		AbstractApplication * app = NULL;
+		app = bamf_matcher_get_active_application(list->priv->matcher);
+
+		if (app != NULL) {
+			source = bamf_app_to_source(list, app);
+		}
+	}
 #endif
 
 	/* If we weren't able to use BAMF, let's try to find a source