Mercurial > pidgin.yaz

changeset 23982:f6b47af95252

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't select the GTK+ checkbox if the current version or a new er version is already installed. Fixes #6942.
author Daniel Atallah <daniel.atallah@gmail.com>
date Thu, 04 Sep 2008 02:10:15 +0000
parents 11d6c66ad001
children 81169f04ab1c
files pidgin/win32/nsis/pidgin-installer.nsi
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Thu Sep 04 01:34:11 2008 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Thu Sep 04 02:10:15 2008 +0000
@@ -1416,13 +1416,17 @@
   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}