Change gdk_surface_get/set_user_data to private API and rename them to get/set_widget. Also remove an unused associated function. The last two places where the surface API is used are in gtkroot.c and gtkwidget.c. Make them use the private api.