Comment 5 for bug 552530

The attached patch also modifies the tests to respect the absence of dbusmenu-gtk.

I will create a patch for betas/rcs when there is interest in actually integrating it.