Original commit message from CVS: Fix up all the state change functions.
Attach a file by drag & drop or click to upload
