I thought I saw this same bug on Windows XP but I can't test it now due to
installation issue on Windows(bug 13686).  So you should verify that this works
correctly in windows, since your change looked like it was GTK specific.