[Xfce4-commits] <midori:master> nsis: Add a couple of icons, make missing icons in certain sizes nonfatal

[Christian Dywan]

Updating branch refs/heads/master
         to 6e182054e0a330fdc209b370eedea2cd45ce71af (commit)
       from feff309a4548b0d0aab8dbde4c2dbeb2f840c618 (commit)

commit 6e182054e0a330fdc209b370eedea2cd45ce71af
Author: Paweł Forysiuk <tuxator at o2.pl>
Date:   Thu Sep 20 18:27:34 2012 +0200

    nsis: Add a couple of icons, make missing icons in certain sizes nonfatal

 win32/makedist/midori-0.3.3.nsi |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/win32/makedist/midori-0.3.3.nsi b/win32/makedist/midori-0.3.3.nsi
index aabed20..2e2e0d1 100644
--- a/win32/makedist/midori-0.3.3.nsi
+++ b/win32/makedist/midori-0.3.3.nsi
@@ -140,13 +140,13 @@ Section "!Program Files" SEC01
 	File "/oname=16x16\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\16x16\${IPath}.png"
 	File "/oname=22x22\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\22x22\${IPath}.png"
 	File "/oname=24x24\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\24x24\${IPath}.png"
-	File "/oname=32x32\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\32x32\${IPath}.png"
+	File /nonfatal "/oname=32x32\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\32x32\${IPath}.png"
 !macroend
 
 !macro InstallIconThemeRename OPath IPath
 	!insertmacro InstallIconThemeRenameSmall ${OPath} ${IPath}
-	File "/oname=48x48\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\48x48\${IPath}.png"
-	File "/oname=scalable\${OPath}.svg" "${RESOURCEDIR}\share\icons\${ICON_THEME}\scalable\${IPath}.svg"
+	File /nonfatal "/oname=48x48\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\48x48\${IPath}.png"
+	File /nonfatal "/oname=scalable\${OPath}.svg" "${RESOURCEDIR}\share\icons\${ICON_THEME}\scalable\${IPath}.svg"
 !macroend
 
 !macro InstallIconThemeSmall IconPath
@@ -199,15 +199,18 @@ Section "!Program Files" SEC01
 	!insertmacro InstallIconTheme "actions\edit-undo"
 	!insertmacro InstallIconTheme "actions\folder-new"
 	!insertmacro InstallIconTheme "actions\format-indent-more"
+	!insertmacro InstallIconTheme "actions\go-down"
 	!insertmacro InstallIconTheme "actions\go-home"
 	!insertmacro InstallIconTheme "actions\go-jump"
 	!insertmacro InstallIconTheme "actions\go-next"
 	!insertmacro InstallIconTheme "actions\go-previous"
+	!insertmacro InstallIconTheme "actions\go-up"
 	!insertmacro InstallIconTheme "actions\gtk-cancel"
 	!insertmacro InstallIconTheme "actions\gtk-edit"
 	!insertmacro InstallIconTheme "actions\gtk-no"
 	!insertmacro InstallIconTheme "actions\gtk-ok"
 	!insertmacro InstallIconTheme "actions\gtk-save"
+	!insertmacro InstallIconTheme "actions\gtk-yes"
 	!insertmacro InstallIconTheme "actions\help-about"
 	!insertmacro InstallIconTheme "actions\help-contents"
 	!insertmacro InstallIconTheme "actions\list-add"