r5598: GTK+ cleanups, remove some globals