pidgin: 7f7111ed: Allow multiple spellcheck dictionaries t...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 7f7111ed9e5924db9e740ad354fce8fb82445b1e
Ancestor: 88a24003053cda8454a59fd448eb6575bdea2e0e
Author: datallah at pidgin.im
Date: 2008-06-23T15:33:44
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7f7111ed9e5924db9e740ad354fce8fb82445b1e

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

ChangeLog: 

Allow multiple spellcheck dictionaries to be installed at the same time on
win32.  This is really only useful if you're using the switchspell plugin.
Fixes #6151

-------------- next part --------------
============================================================
--- pidgin/win32/nsis/pidgin-installer.nsi	6dbe7abc0a43514f3803354740836e326ac5e8e5
+++ pidgin/win32/nsis/pidgin-installer.nsi	1f591f8a45fcdffea0cff437df84135b35a0a334
@@ -1388,67 +1388,6 @@ FunctionEnd
 
 FunctionEnd
 
-; This is a modified StartRadioButtons (from Sections.nsh)
-; The only difference is that it allows for nothing in the group to be selected
-; In that case, the default variable should be set to ""
-!macro StartRadioButtonsUnselectable var
-
-  !define StartRadioButtons_Var "${var}"
-
-  Push $R0
-  Push $R1
-
-   ;If we have no selection, don't try to unselect it
-   StrCmp "${StartRadioButtons_Var}" "" +4
-   SectionGetFlags "${StartRadioButtons_Var}" $R0
-   IntOp $R1 $R0 & ${SF_SELECTED}
-   IntOp $R0 $R0 & ${SECTION_OFF}
-   SectionSetFlags "${StartRadioButtons_Var}" $R0
-
-   ; If the previous value isn't currently selected,
-   ; we don't want to select it at the end
-   IntCmp $R1 ${SF_SELECTED} +2
-   StrCpy "${StartRadioButtons_Var}" ""
-
-   StrCpy $R1 "${StartRadioButtons_Var}"
-
-!macroend
-
-Function .onSelChange
-  Push $0
-  Push $1
-  Push $2
-
-  ; Check that at most one of the non-readonly spelling dictionaries are selected
-  ; We can't use $R0 or $R1 in this block since they're used in the macros
-  !insertmacro StartRadioButtonsUnselectable $SPELLCHECK_SEL
-    ; Start with the first language dictionary
-    IntOp $2 ${SecSpellCheck} + 1
-
-    start_spellcheck_radio:
-    SectionGetFlags $2 $0
-
-    IntOp $1 $0 & ${SF_SECGRPEND}
-    ; If it is the end of the section group, stop
-    IntCmp $1 ${SF_SECGRPEND} end_spellcheck_radio
-
-    IntOp $0 $0 & ${SF_RO}
-    IntCmp $0 ${SF_RO} after_button_insert
-    ; If !readonly, then it is part of the radiobutton group
-    !insertmacro RadioButton $2
-    after_button_insert:
-
-    IntOp $2 $2 + 1 ;Advance to the next section
-    Goto start_spellcheck_radio
-
-    end_spellcheck_radio:
-  !insertmacro EndRadioButtons
-
-  Pop $2
-  Pop $1
-  Pop $0
-FunctionEnd
-
 ; Page enter and exit functions..
 
 Function preWelcomePage