Small fixes for undefined variables.

This pull request includes 2 patches of mine. Get rid of xulrunner complaining about deprecated functions or undefined variables.

And one from xtaran which came to my tree from origin (http://repo.or.cz/w/conkeror.git)