2005-05-24  Kjartan Maraas  <kmaraas@gnome.org>

	* Fix some issues with patch in bug #90259. (Tim Janik)
	  This closes the canvas part of bug #304915 too.