Created attachment 2918 
use SHELL before pw_shell

After the patch from bug http://bugzilla.xfce.org/show_bug.cgi?id=4970, Terminal now uses SHELL as fall-back when nothing was returned from getpwuid.  However, this behaviour favours the shell as set in the user's account over the SHELL setting in the environment.

xterm and gnome-term seem to respect this variable when they find the shell to spawn, Terminal however does not.  As a result, a user who set SHELL=/my/own/shell and starts Terminal, will not get this shell, but instead the one from the user's account record (which isn't always under control by the user).

The attached patch prioritises honouring SHELL over what's in the user's account.  The patch works for me, and makes Terminal behave like xterm and gnome-term do, starting the right shell, and hence ending up in the right environment.