Merge lp:~robertcarr/bamf/webapps-typo-1051042 into lp:bamf/0.4

Proposed by Robert Carr on 2012-09-14
Status: Merged
Approved by: Marco Trevisan (Treviño) on 2012-09-17
Approved revision: 483
Merged at revision: 483
Proposed branch: lp:~robertcarr/bamf/webapps-typo-1051042
Merge into: lp:bamf/0.4
Diff against target: 25 lines (+2/-2)
2 files modified
src/bamf-application.c (+1/-1)
src/bamf-unity-webapps-application.c (+1/-1)
To merge this branch: bzr merge lp:~robertcarr/bamf/webapps-typo-1051042
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) 2012-09-14 Approve on 2012-09-17
Review via email: mp+124500@code.launchpad.net

Commit message

Fix typo in bamf_unity_webapps_application_get_close_when_empty, closes bug 1051042

Description of the change

Fix typo in bamf_unity_webapps_application_get_close_when_empty, closes bug 1051042

To post a comment you must log in.
483. By Robert Carr on 2012-09-14

Fix typo in bamf_unity_webapps_application_get_close_when_empty closing #1051042

Marco Trevisan (Treviño) (3v1n0) wrote :

looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/bamf-application.c'
2--- src/bamf-application.c 2012-08-21 22:01:48 +0000
3+++ src/bamf-application.c 2012-09-14 19:03:22 +0000
4@@ -576,7 +576,7 @@
5
6 close_when_empty = bamf_application_get_close_when_empty (self);
7 bamf_view_set_urgent (BAMF_VIEW (self), urgent);
8- if (!((close_when_empty == FALSE) && running == FALSE))
9+ if (close_when_empty == TRUE || running == TRUE)
10 bamf_view_set_user_visible (BAMF_VIEW (self), visible);
11 if ((running == TRUE) || close_when_empty)
12 bamf_view_set_running (BAMF_VIEW (self), running);
13
14=== modified file 'src/bamf-unity-webapps-application.c'
15--- src/bamf-unity-webapps-application.c 2012-08-21 22:01:48 +0000
16+++ src/bamf-unity-webapps-application.c 2012-09-14 19:03:22 +0000
17@@ -304,7 +304,7 @@
18 // Sometimes we might have no children for a short period (for example, the page is reloading), in the case
19 // Unity Webapps will keep the context alive for a while. Allowing for new children to appear...before eventually
20 // shutting it down. So we use this flag to ensure BAMF will not shut us down prematurely.
21- return TRUE;
22+ return FALSE;
23 }
24
25 static void

Subscribers

People subscribed via source and target branches