Ubuntu One Windows Installer

Merge lp:~brian.curtin/ubuntuone-windows-installer/with-icon into lp:ubuntuone-windows-installer

  1. with-icon
  2. Merge into trunk
Proposed by Brian Curtin on 2012-03-23
Status: Merged
Approved by: Roberto Alsina on 2012-03-25
Approved revision: 109
Merged at revision: 108
Proposed branch: lp:~brian.curtin/ubuntuone-windows-installer/with-icon
Merge into: lp:ubuntuone-windows-installer
Prerequisite: lp:~ralsina/ubuntuone-windows-installer/doing-windows
Diff against target: 38 lines (+4/-3)
1 file modified
scripts/ubuntuone.xml (+4/-3)
To merge this branch: bzr merge lp:~brian.curtin/ubuntuone-windows-installer/with-icon
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2012-03-23 Approve on 2012-03-25
Review via email: mp+99086@code.launchpad.net

Commit Message

- Added --with-icon to all installer commands and shortcuts to ensure Ubuntu One resides in the system tray on Windows

Description of the Change

Add --with-icon to all of the installer's commands and shortcuts

To post a comment you must log in.
lp:~brian.curtin/ubuntuone-windows-installer/with-icon updated on 2012-03-23
109. By Brian Curtin on 2012-03-23

merge with trunk

Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'scripts/ubuntuone.xml'
2--- scripts/ubuntuone.xml 2012-03-23 18:32:10 +0000
3+++ scripts/ubuntuone.xml 2012-03-23 21:10:23 +0000
4@@ -47,6 +47,7 @@
5 <runAsAdmin>0</runAsAdmin>
6 <runInTerminal>0</runInTerminal>
7 <windowsExec>${installdir}\dist\ubuntuone-control-panel-qt.exe</windowsExec>
8+ <windowsExecArgs>--with-icon</windowsExecArgs>
9 <windowsIcon>${installdir}/ubuntu_one.ico</windowsIcon>
10 <windowsPath>${windows_folder_desktopdirectory}</windowsPath>
11 </shortcut>
12@@ -136,7 +137,7 @@
13 <runAsAdmin>0</runAsAdmin>
14 <runInTerminal>0</runInTerminal>
15 <windowsExec>${installdir}\dist\ubuntuone-control-panel-qt.exe</windowsExec>
16- <windowsExecArgs></windowsExecArgs>
17+ <windowsExecArgs>--with-icon</windowsExecArgs>
18 <windowsIcon>${installdir}/ubuntu_one.ico</windowsIcon>
19 <windowsPath>${windows_folder_desktopdirectory}</windowsPath>
20 </startMenuShortcut>
21@@ -227,7 +228,7 @@
22 </registrySet>
23 <runProgram>
24 <program>${windows_folder_system}\RunDll32.exe</program>
25- <programArguments>"${installdir}\dist\VistaLib32.dll" RunNonElevated "${installdir}\dist\ubuntuone-control-panel-qt.exe --installer &amp;"</programArguments>
26+ <programArguments>"${installdir}\dist\VistaLib32.dll" RunNonElevated "${installdir}\dist\ubuntuone-control-panel-qt.exe" --installer --with-icon &amp;</programArguments>
27 <useMSDOSPath>0</useMSDOSPath>
28 <ruleList>
29 <compareText>
30@@ -242,7 +243,7 @@
31 </runProgram>
32 <runProgram>
33 <program>${windows_folder_system}\RunDll32.exe</program>
34- <programArguments>"${installdir}\dist\VistaLib64.dll" RunNonElevated "${installdir}\dist\ubuntuone-control-panel-qt.exe" --installer &amp;</programArguments>
35+ <programArguments>"${installdir}\dist\VistaLib64.dll" RunNonElevated "${installdir}\dist\ubuntuone-control-panel-qt.exe" --installer --with-icon &amp;</programArguments>
36 <useMSDOSPath>0</useMSDOSPath>
37 <ruleList>
38 <compareText>

Subscribers

People subscribed via source and target branches