* e-setup.c (e_setup): Check for ~/evolution/shortcuts.xml in addition to ~/evolution, to make sure it's really the directory we're expecting it to be. Also, convert from old-style config file to new-style config directory. svn path=/trunk/; revision=4594