diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-10-25 19:33:36 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-10-25 19:33:36 +0000 |
| commit | b3e5d2f39dbff94c3575b96d154353728a2e1daa (patch) | |
| tree | e5bc4e513768ee039e835e25c1241f31c1b21315 /packaging/portableapps | |
| parent | 771e9ef518abe978ddde54ad41f4775edd7a4d9f (diff) | |
More fixes from John T. Haller via bug 4158, with some cleanups from me.
svn path=/trunk/; revision=30696
Diffstat (limited to 'packaging/portableapps')
| -rwxr-xr-x | packaging/portableapps/win32/Installer.nsi | 4 | ||||
| -rwxr-xr-x | packaging/portableapps/win32/WiresharkPortable.nsi | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packaging/portableapps/win32/Installer.nsi b/packaging/portableapps/win32/Installer.nsi index f6bf0adef4..54b5db0573 100755 --- a/packaging/portableapps/win32/Installer.nsi +++ b/packaging/portableapps/win32/Installer.nsi @@ -74,10 +74,10 @@ RequestExecutionLevel user !insertmacro GetSize ;=== Program Icon -Icon "Files\App\AppInfo\${APP}.ico" +Icon "Files\App\AppInfo\appicon.ico" ;=== Icon & Stye === -!define MUI_ICON "Files\App\AppInfo\wireshark.ico" +!define MUI_ICON "Files\App\AppInfo\appicon.ico" BrandingText "PortableApps.com - Your Digital Life, Anywhere™" ;=== Pages diff --git a/packaging/portableapps/win32/WiresharkPortable.nsi b/packaging/portableapps/win32/WiresharkPortable.nsi index a490eac830..1e5402cea3 100755 --- a/packaging/portableapps/win32/WiresharkPortable.nsi +++ b/packaging/portableapps/win32/WiresharkPortable.nsi @@ -57,13 +57,14 @@ WindowIcon Off SilentInstall Silent AutoCloseWindow True RequestExecutionLevel user +XPStyle on ;=== Include !include "FileFunc.nsh" !insertmacro GetParameters ;=== Program Icon -Icon "Files/App/AppInfo/${APP}.ico" +Icon "Files\App\AppInfo\appicon.ico" Var PROGRAMDIRECTORY Var ADDITIONALPARAMETERS |