# HG changeset patch # User Daniel Atallah # Date 1220494215 0 # Node ID f6b47af95252aef18aa7f60b636fa22feca3da55 # Parent 11d6c66ad001496e9dde81976be8389d6bba7c11 Don't select the GTK+ checkbox if the current version or a new er version is already installed. Fixes #6942. diff -r 11d6c66ad001 -r f6b47af95252 pidgin/win32/nsis/pidgin-installer.nsi --- 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}