src/inc.c: sync with main (code cleanup); tools/nautlilus2sylpheed.sh: fix whitespace...