Merge lp:~ted/hud/lp1247898 into lp:hud/13.10

[Ted Gould]

Improve handling of unfound windows

We need more errors in our life.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:348
http://jenkins.qa.ubuntu.com/job/hud-13.10-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-13.10-saucy-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-13.10-saucy-armhf-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-13.10-saucy-i386-ci/7

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/hud-13.10-ci/6/rebuild

review: Approve (continuous-integration)

[Charles Kerr (charlesk)]

Looks good.

review: Approve

=== modified file 'src/window-info.c'
--- src/window-info.c	2013-10-11 16:16:21 +0000
+++ src/window-info.c	2013-11-04 17:45:18 +0000
@@ -128,6 +128,7 @@
 		const gchar * const *property_names) {
 	gchar **result = NULL;
 	GError *error = NULL;
+
 	if (!dbus_window_stack_call_get_window_properties_sync(self->window_stack,
 			self->window_id, self->app_id, property_names, &result, NULL,
 			&error)) {
@@ -135,5 +136,12 @@
 		g_error_free(error);
 		return NULL;
 	}
+
+	if (g_strv_length(result) != g_strv_length((gchar **)property_names)) {
+		g_warning("Unable to get all properties from Window Switcher");
+		g_strfreev(result);
+		result = NULL;
+	}
+
 	return result;
 }
 
=== modified file 'window-stack-bridge/BamfWindowStack.cpp'
--- window-stack-bridge/BamfWindowStack.cpp	2013-10-28 19:31:45 +0000
+++ window-stack-bridge/BamfWindowStack.cpp	2013-11-04 17:45:18 +0000
@@ -198,8 +198,10 @@
 	QStringList result;
 	auto window = m_windowsById[windowId];
 
-	if (window == nullptr)
+	if (window == nullptr) {
+		sendErrorReply(QDBusError::InvalidArgs, "Unable to find windowId");
 		return result;
+	}
 
 	for (const QString &name : names) {
 		result << window->xProp(name);