DI more things.

Change-Id: I9364579f1f03cfbd22ac51efb61c598da9b6e96d
Reviewed-on: http://gerrit.dmdirc.com/2922
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>