# HG changeset patch # User Daniel Atallah # Date 1282526065 0 # Node ID 0b8ac7c5e6b6b0b617a509d6405c5a70fae10bce # Parent 6d8c88a8af2551d2f0aab342c6e07e0786cb3e37 ------------------------------------------------------------------------------- In the Windows installer, display the same "Retry/Cancel" error message when the user cancels the GTK+ download as when the download fails due to another reason. Fixes #12045 diff -r 6d8c88a8af25 -r 0b8ac7c5e6b6 pidgin/win32/nsis/pidgin-installer.nsi --- a/pidgin/win32/nsis/pidgin-installer.nsi Sun Aug 22 16:43:39 2010 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Mon Aug 23 01:14:25 2010 +0000 @@ -268,7 +268,7 @@ DetailPrint "Downloading GTK+ Runtime ... ($R2)" NSISdl::download /TIMEOUT=10000 $R2 $R1 Pop $R0 - StrCmp $R0 "cancel" done + ;StrCmp $R0 "cancel" done StrCmp $R0 "success" +2 MessageBox MB_RETRYCANCEL "$(PIDGINGTKDOWNLOADERROR)" /SD IDCANCEL IDRETRY retry IDCANCEL done