pidgin: 9e3f088f: Fix the win32 installer not to cause mes...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 9e3f088fc7df07bdb891f336b152797fd4f1ff07
Ancestor: c5f971433ffb3d76c1e30e850f921576ecd4ea87
Author: datallah at pidgin.im
Date: 2008-07-29T23:51:06
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9e3f088fc7df07bdb891f336b152797fd4f1ff07

Modified files:
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

Fix the win32 installer not to cause messageboxes in the gtk installer when
running in silent mode.
Fixes #6454

-------------- next part --------------
============================================================
--- pidgin/win32/nsis/pidgin-installer.nsi	5a2f708af90f67e3ee3e088b3f72cc2fb55b26bf
+++ pidgin/win32/nsis/pidgin-installer.nsi	e147c56ea0d60bb0848ce0ab1916f3309da4a924
@@ -376,7 +376,7 @@ Section $(GTK_SECTION_TITLE) SecGtk
     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 @@ Function .onInit
   ;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