Rename (private) GSource.id and id parameter to