Merge lp:~aacid/unity-2d/fixGetBamfWindowForApplication into lp:unity-2d

Proposed by Albert Astals Cid
Status: Merged
Approved by: Gerry Boland
Approved revision: 836
Merged at revision: 837
Proposed branch: lp:~aacid/unity-2d/fixGetBamfWindowForApplication
Merge into: lp:unity-2d
Diff against target: 11 lines (+2/-0)
1 file modified
libunity-2d-private/src/windowinfo.cpp (+2/-0)
To merge this branch: bzr merge lp:~aacid/unity-2d/fixGetBamfWindowForApplication
Reviewer Review Type Date Requested Status
Gerry Boland Pending
Review via email: mp+87321@code.launchpad.net

Description of the change

Reset window to NULL if it's not the one we are looking for

Otherwise in case we don't find the one with the xid we want the function returns the pointer of the last window of the list

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libunity-2d-private/src/windowinfo.cpp'
2--- libunity-2d-private/src/windowinfo.cpp 2011-08-01 13:04:32 +0000
3+++ libunity-2d-private/src/windowinfo.cpp 2012-01-03 09:00:51 +0000
4@@ -56,6 +56,8 @@
5 window = windows->at(i);
6 if (window->xid() == xid) {
7 break;
8+ } else {
9+ window = NULL;
10 }
11 }
12

Subscribers

People subscribed via source and target branches