Merge lp:~mikemc/ubuntuone-windows-installer/make-cp-fg into lp:ubuntuone-windows-installer

Proposed by Mike McCracken on 2012-10-09
Status: Merged
Approved by: Roberto Alsina on 2012-10-09
Approved revision: 143
Merged at revision: 141
Proposed branch: lp:~mikemc/ubuntuone-windows-installer/make-cp-fg
Merge into: lp:ubuntuone-windows-installer
Diff against target: 12 lines (+1/-1)
1 file modified
scripts/setup-mac.py (+1/-1)
To merge this branch: bzr merge lp:~mikemc/ubuntuone-windows-installer/make-cp-fg
Reviewer Review Type Date Requested Status
Brian Curtin (community) 2012-10-09 Approve on 2012-10-09
Review via email: mp+128811@code.launchpad.net

Commit message

- Make UbuntuOne.app (control-panel) foreground, with a dock icon and menu bar.

Description of the change

- Make UbuntuOne.app (control-panel) foreground, with a dock icon and menu bar.

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/setup-mac.py'
2--- scripts/setup-mac.py 2012-09-26 20:15:39 +0000
3+++ scripts/setup-mac.py 2012-10-09 20:21:19 +0000
4@@ -625,7 +625,7 @@
5 "com.ubuntu.one.u1sdtool",
6 "u1sdtool")
7
8- control_panel_app_path = do_setup(True,
9+ control_panel_app_path = do_setup(False,
10 "com.ubuntu.one.controlpanel",
11 "ubuntuone-control-panel-qt",
12 is_main_app=True)

Subscribers

People subscribed via source and target branches