Patch by Petr Salinger <Petr.Salinger@seznam.cz>. Closes #507430. svn path=/branches/gnome-2-20/; revision=2696