Mercurial > pidgin.yaz

diff pidgin/win32/nsis/pidgin-installer.nsi @ 23662:f5e614bc6606

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix the win32 installer not to cause messageboxes in the gtk installer when running in silent mode. Fixes #6454
author Daniel Atallah <daniel.atallah@gmail.com>
date Tue, 29 Jul 2008 23:51:06 +0000
parents ab5b9acebde3
children c014c3fe0de9
line wrap: on
line diff
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Tue Jul 29 18:55:03 2008 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Tue Jul 29 23:51:06 2008 +0000
@@ -376,7 +376,7 @@
     StrCmp $R0 "2" +2 ; Upgrade isn't optional
     MessageBox MB_YESNO $(GTK_UPGRADE_PROMPT) /SD IDYES IDNO done
     ClearErrors
-    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE /S /D=$GTK_FOLDER'
+    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER'
     IfErrors gtk_install_error done
 
     gtk_install_error:
@@ -1315,12 +1315,12 @@
   ;Reset ShellVarContext because we may have changed it
   SetShellVarContext "current"
 
-  StrCpy $ISSILENT "/NOUI"
+  StrCpy $ISSILENT "/S"
 
   ; GTK installer has two silent states.. one with Message boxes, one without
   ; If pidgin installer was run silently, we want to supress gtk installer msg boxes.
   IfSilent 0 set_gtk_normal
-      StrCpy $ISSILENT "/S"
+      StrCpy $ISSILENT "/NOUI"
   set_gtk_normal:
 
   ${GetParameters} $R0