Merge lp:~indicator-applet-developers/hud/getproperties-list-correct-length into lp:hud/14.04

Proposed by Pete Woods
Status: Merged
Approved by: Charles Kerr
Approved revision: 345
Merged at revision: 345
Proposed branch: lp:~indicator-applet-developers/hud/getproperties-list-correct-length
Merge into: lp:hud/14.04
Diff against target: 17 lines (+4/-2)
1 file modified
window-stack-bridge/BamfWindowStack.cpp (+4/-2)
To merge this branch: bzr merge lp:~indicator-applet-developers/hud/getproperties-list-correct-length
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+193240@code.launchpad.net

Commit message

In the window stack always return a property list of the correct length

Description of the change

In the window stack always return a property list of the correct length

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

Yikes!

Thanks Pete :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'window-stack-bridge/BamfWindowStack.cpp'
2--- window-stack-bridge/BamfWindowStack.cpp 2013-10-28 19:21:39 +0000
3+++ window-stack-bridge/BamfWindowStack.cpp 2013-10-30 13:29:51 +0000
4@@ -197,9 +197,11 @@
5 const QString &appId, const QStringList &names) {
6 QStringList result;
7 const auto window = m_windowsById[windowId];
8- if (window) {
9- for (const QString &name : names) {
10+ for (const QString &name : names) {
11+ if (window) {
12 result << window->xProp(name);
13+ } else {
14+ result << QString();
15 }
16 }
17 return result;

Subscribers

People subscribed via source and target branches

to all changes: