Comment 1 for bug 85654

You can see the discussion of this here:

 http://bugzilla.gnome.org/show_bug.cgi?id=343825

Attached is a tested patch to clean this up; I didn't want to commit directly to the bzr trunk since I hadn't looked at this code before. If someone says "okay", I'll do it and upload a new package, though. :)