Im having a debate with my friend but since neither of us are historians, we thought we'd get a professional opinion.
The short answer is that it was both. I can expand if you'd like, but I just wrote this about Lincoln and emancipation a few days back, which covers the basics.
Edit: There's a bit more here too, but more about Lincoln's past career than the circumstances of emancipation.