Merge lp:~pete-woods/hud/13.10-lp1238420 into lp:hud/13.10

[Pete Woods]

Backport fixes to window stack bridge

Backport fixes to window stack bridge

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:348
http://jenkins.qa.ubuntu.com/job/hud-13.10-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-13.10-saucy-amd64-ci/9/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-13.10-saucy-armhf-ci/9
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-13.10-saucy-i386-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/hud-13.10-ci/9/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:348
http://jenkins.qa.ubuntu.com/job/hud-13.10-ci/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-13.10-saucy-amd64-ci/10/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/hud-13.10-saucy-armhf-ci/10
    FAILURE: http://jenkins.qa.ubuntu.com/job/hud-13.10-saucy-i386-ci/11/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/hud-13.10-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[Charles Kerr (charlesk)]

Seems to be killing test-application-list...?

review: Needs Fixing

[Ted Gould (ted)]

13.10 is no longer a supported release.

review: Disapprove

Unmerged revisions

348. By Pete Woods on 2014-02-26

Backport fixes to BamfWindowStack

=== modified file 'window-stack-bridge/BamfWindowStack.cpp'
--- window-stack-bridge/BamfWindowStack.cpp	2013-11-04 17:38:54 +0000
+++ window-stack-bridge/BamfWindowStack.cpp	2014-02-26 12:07:32 +0000
@@ -57,12 +57,13 @@
 		QDBusPendingReply<QString> desktopFileReply(application.DesktopFile());
 		desktopFileReply.waitForFinished();
 		if (desktopFileReply.isError()) {
-			qWarning() << _("Could not get desktop file for") << path;
+			qWarning() << _("Could not get desktop file for") << path
+					<< desktopFileReply.error();
 			m_error = true;
 			return;
 		} else {
-			QFile desktopFile(desktopFileReply);
-			if (desktopFile.exists()) {
+			QString desktopFile(desktopFileReply);
+			if (!desktopFile.isEmpty()) {
 				m_applicationId = QFileInfo(desktopFile).baseName();
 			}
 		}
@@ -160,6 +161,7 @@
 }
 
 QString BamfWindowStack::GetAppIdFromPid(uint pid) {
+	Q_UNUSED(pid);
 	// FIXME Not implemented
 	sendErrorReply(QDBusError::NotSupported,
 			"GetAppIdFromPid method not implemented");
@@ -169,17 +171,33 @@
 QList<WindowInfo> BamfWindowStack::GetWindowStack() {
 	QList<WindowInfo> results;
 
-	QStringList stack(m_matcher.WindowStackForMonitor(-1));
+	QDBusPendingReply<QStringList> stackReply(
+			m_matcher.WindowStackForMonitor(-1));
+	stackReply.waitForFinished();
+	if (stackReply.isError()) {
+		qWarning() << "Failed to get BAMF window stack" << stackReply.error();
+		return results;
+	}
+
+	QStringList stack(stackReply);
 	for (const QString &path : stack) {
-		const auto window (m_windows[path]);
+		const auto window(m_windows[path]);
 		if (window) {
-			results << WindowInfo(window->windowId(),
-			                      window->applicationId(),
-			                      false);
+			results
+					<< WindowInfo(window->windowId(), window->applicationId(),
+							false);
 		}
 	}
 
-	const auto window (m_windows[m_matcher.ActiveWindow()]);
+	QDBusPendingReply<QString> activeWindowReply(m_matcher.ActiveWindow());
+	activeWindowReply.waitForFinished();
+	if (activeWindowReply.isError()) {
+		qWarning() << "Failed to get BAMF active window"
+				<< activeWindowReply.error();
+		return results;
+	}
+
+	const auto window(m_windows[activeWindowReply]);
 	if (window) {
 		const uint windowId(window->windowId());
 
@@ -195,8 +213,9 @@
 
 QStringList BamfWindowStack::GetWindowProperties(uint windowId,
 		const QString &appId, const QStringList &names) {
+	Q_UNUSED(appId);
 	QStringList result;
-	auto window = m_windowsById[windowId];
+	const auto window = m_windowsById[windowId];
 
 	if (window == nullptr) {
 		sendErrorReply(QDBusError::InvalidArgs, "Unable to find windowId");
@@ -204,19 +223,23 @@
 	}
 
 	for (const QString &name : names) {
-		result << window->xProp(name);
+		if (window) {
+			result << window->xProp(name);
+		} else {
+			result << QString();
+		}
 	}
 	return result;
 }
 
 void BamfWindowStack::ActiveWindowChanged(const QString &oldWindowPath,
 		const QString &newWindowPath) {
+	Q_UNUSED(oldWindowPath);
 	if (!newWindowPath.isEmpty()) {
 		const auto window(m_windows[newWindowPath]);
 		if (window) {
-			FocusedWindowChanged(window->windowId(),
-			                     window->applicationId(),
-			                     WindowInfo::MAIN);
+			FocusedWindowChanged(window->windowId(), window->applicationId(),
+					WindowInfo::MAIN);
 		}
 	}
 }