diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-06-29 07:14:39 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-06-29 07:14:39 +0000 |
| commit | d4488c7af73abaab57597bba9d70aa3bf7f5498d (patch) | |
| tree | 470d4a7da72ad15671d83215a89334a17b6adb17 /packaging | |
| parent | 3d0c13af5251cbba1f0310c3a15ec5c246727c24 (diff) | |
From Laurent Rabret:
fix a bug in the case where both Ethereal with GTK1 and GTK2 are
attached;
disallow the "extension box" if Ethereal isn't selected.
svn path=/trunk/; revision=11266
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/nsis/ethereal.nsi | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index d0da8d36d3..e12168a243 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -1,7 +1,7 @@ ; ; ethereal.nsi ; -; $Id: ethereal.nsi,v 1.57 2004/06/10 10:12:30 guy Exp $ +; $Id: ethereal.nsi,v 1.58 2004/06/29 07:14:39 guy Exp $ !ifdef MAKENSIS_MODERN_UI @@ -638,24 +638,42 @@ SectionEnd ; ============================================================================ ; Callback functions ; ============================================================================ +; We simulate the XOR operator +!ifdef GTK1_DIR & GTK2_DIR +!else +!ifdef GTK1_DIR | GTK2_DIR Function .onSelChange Push $0 -!ifdef GTK1_DIR +!ifdef GTK1_DIR SectionGetFlags ${SecEtherealGTK1} $0 - IntOp $0 $0 & 1 + IntOp $0 $0 & 1 IntCmp $0 0 onSelChange.unselect + SectionGetFlags ${SecFileExtensions} $0 + IntOp $0 $0 & 16 + IntCmp $0 16 onSelChange.unreadonly Goto onSelChange.end -!endif -!ifdef GTK2_DIR +!else SectionGetFlags ${SecEtherealGTK2} $0 - IntOp $0 $0 & 1 + IntOp $0 $0 & 1 IntCmp $0 0 onSelChange.unselect + SectionGetFlags ${SecFileExtensions} $0 + IntOp $0 $0 & 16 + IntCmp $0 16 onSelChange.unreadonly Goto onSelChange.end !endif onSelChange.unselect: SectionGetFlags ${SecFileExtensions} $0 IntOp $0 $0 & 0xFFFFFFFE + IntOp $0 $0 | 0x10 SectionSetFlags ${SecFileExtensions} $0 + Goto onSelChange.end +onSelChange.unreadonly: + SectionGetFlags ${SecFileExtensions} $0 + IntOp $0 $0 & 0xFFFFFFEF + SectionSetFlags ${SecFileExtensions} $0 + Goto onSelChange.end onSelChange.end: Pop $0 FunctionEnd +!endif +!endif |