Import the patch for devel/gnome-common that got into MC. Remove my previous one to keep the port in sync with MC.