pidgin: 33ffaa2a: Don't select the GTK+ checkbox if the cu...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 33ffaa2a6ae55f021ebb7b3f3ab714403ee97f46
Ancestor: 9a22d72e5de9a713f3c86c63ae16461c0c72f12d
Author: datallah at pidgin.im
Date: 2008-09-04T02:10:15
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/33ffaa2a6ae55f021ebb7b3f3ab714403ee97f46

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

ChangeLog: 

Don't select the GTK+ checkbox if the current version or a new er version is
already installed.
Fixes #6942.

-------------- next part --------------
============================================================
--- pidgin/win32/nsis/pidgin-installer.nsi	6e9840b68bb7609a79f71fe99a931735c162e374
+++ pidgin/win32/nsis/pidgin-installer.nsi	19abafc184c36737cf8835bf52491582a3e06c7b
@@ -1416,13 +1416,17 @@ Function preWelcomePage
   Push $R1
   Push $R2
 
-  ; Make the GTK+ Section RO if it is required.
   Call DoWeNeedGtk
   Pop $R0
   Pop $R2
-  IntCmp $R0 1 gtk_not_mandatory gtk_not_mandatory
+  IntCmp $R0 1 gtk_selection_done gtk_not_mandatory
+    ; Make the GTK+ Section RO if it is required.
     !insertmacro SetSectionFlag ${SecGtk} ${SF_RO}
+    Goto gtk_selection_done
   gtk_not_mandatory:
+    ; Don't select the GTK+ section if we already have this version or newer installed
+    !insertmacro UnselectSection ${SecGtk}
+  gtk_selection_done:
 
   ; If on Win95/98/ME warn them that the GTK+ version wont work
   ${Unless} ${IsNT}