OK, I once again have a working system, so here's the new patch, with the label-misnaming fixed.
By this way, this patch only includes the new .glade file; you'll probably have to run glade-2 and generate code to test it. I didn't mention that before. (I did it this way so the patch would compress to <3K rather than >10K, for easy emailing.) Now everything seems to work fine. Meanwhile, Emile seems to have submitted a patch which includes some of these same changes; if so, applying both is probably a bad idea....
glade2-update.diff.bz2
Description: BZip2 compressed data
