Port was incomplete again.  A call to main_quit had not been tested, and
commented code was not ported or removed.

Regression introduced c540bcd

Signed-off-by: James Cameron <quozl@laptop.org>