pidgin: 18165490: ----------------------------------------...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 18165490eda6d90edf28f315d87b8c2eb40849df
Parent:   c6846e134f765c0da81a81bb60301dedcbb0d4fe
Author:   datallah at pidgin.im
Date:     08/22/10 21:14:25
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/18165490eda6d90edf28f315d87b8c2eb40849df

Changelog: 

-------------------------------------------------------------------------------
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

Changes against parent c6846e134f765c0da81a81bb60301dedcbb0d4fe

  patched  pidgin/win32/nsis/pidgin-installer.nsi

-------------- next part --------------
============================================================
--- pidgin/win32/nsis/pidgin-installer.nsi	753d11f1ccb7fb440b0bb605d92452d4edda61ef
+++ pidgin/win32/nsis/pidgin-installer.nsi	9b16156b7fe6214aa6eb7b432ca35f9627b9210b
@@ -268,7 +268,7 @@ Section $(GTKSECTIONTITLE) SecGtk
   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