Updated for glib-1.3.4