When we receive a NotionNotify event, there's no need to (incorrectly
might I add) redraw the top menu selection.
Sync with latest upstream changes.

Merge branch 'cvs-tracking'
If not using sticky mode (the default), clients aren't automagically
assigned a group, thus cc->group will be NULL - fix the client group
shortcut in menu lists; crash reported by Christian Neukirchen.
Sync with latest upstream changes.

Merge branch 'cvs-tracking'