Code review comment for lp:~indicator-applet-developers/indicator-messages/consolidate

Thanks Pete, there is a merge conflict in src/im-desktop-menu.c there though. Would it also be possible to have the previous branch re-used? e.g show the fix as a different commit, would make things easier to review