Mercurial > pidgin.yaz

comparison 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
comparison
equal deleted inserted replaced
23661:6659ba7b3941 23662:f5e614bc6606
374 upgrade_gtk: 374 upgrade_gtk:
375 StrCpy $GTK_FOLDER $R6 375 StrCpy $GTK_FOLDER $R6
376 StrCmp $R0 "2" +2 ; Upgrade isn't optional 376 StrCmp $R0 "2" +2 ; Upgrade isn't optional
377 MessageBox MB_YESNO $(GTK_UPGRADE_PROMPT) /SD IDYES IDNO done 377 MessageBox MB_YESNO $(GTK_UPGRADE_PROMPT) /SD IDYES IDNO done
378 ClearErrors 378 ClearErrors
379 ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE /S /D=$GTK_FOLDER' 379 ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER'
380 IfErrors gtk_install_error done 380 IfErrors gtk_install_error done
381 381
382 gtk_install_error: 382 gtk_install_error:
383 Delete "$TEMP\gtk-runtime.exe" 383 Delete "$TEMP\gtk-runtime.exe"
384 MessageBox MB_OK $(GTK_INSTALL_ERROR) /SD IDOK 384 MessageBox MB_OK $(GTK_INSTALL_ERROR) /SD IDOK
1313 !insertmacro UnselectSection ${SecStartMenuShortcut} 1313 !insertmacro UnselectSection ${SecStartMenuShortcut}
1314 done_preselecting_shortcuts: 1314 done_preselecting_shortcuts:
1315 ;Reset ShellVarContext because we may have changed it 1315 ;Reset ShellVarContext because we may have changed it
1316 SetShellVarContext "current" 1316 SetShellVarContext "current"
1317 1317
1318 StrCpy $ISSILENT "/NOUI" 1318 StrCpy $ISSILENT "/S"
1319 1319
1320 ; GTK installer has two silent states.. one with Message boxes, one without 1320 ; GTK installer has two silent states.. one with Message boxes, one without
1321 ; If pidgin installer was run silently, we want to supress gtk installer msg boxes. 1321 ; If pidgin installer was run silently, we want to supress gtk installer msg boxes.
1322 IfSilent 0 set_gtk_normal 1322 IfSilent 0 set_gtk_normal
1323 StrCpy $ISSILENT "/S" 1323 StrCpy $ISSILENT "/NOUI"
1324 set_gtk_normal: 1324 set_gtk_normal:
1325 1325
1326 ${GetParameters} $R0 1326 ${GetParameters} $R0
1327 ClearErrors 1327 ClearErrors
1328 ${GetOptions} "$R0" "/L=" $R1 1328 ${GetOptions} "$R0" "/L=" $R1