Merge pull request #2114 from mtwebster/magical-selection

cinnamon-settings: Fix regression caused by earlier patch addressing
1.9.1
Some initial changes for cinnamon-settings-daemon
Use "Cinnamon" for session DesktopName
Change onlyshowin to Cinnamon
Set XDG_CURRENT_DESKTOP to GNOME at cinnamon startup so programs that are
OnlyShowIn=GNOME will display.
more renaming
Change Cinnamon to X-Cinnamon
Fixes to deal with cinnamon-session