- if ((desktop_surface_check_last_remote_surfaces(output->ivi,
- IVI_SURFACE_ROLE_REMOTE) ||
- desktop_surface_check_last_remote_surfaces(output->ivi,
- IVI_SURFACE_ROLE_DESKTOP)) && output->type == OUTPUT_REMOTE)
+ if (ivi_surface_count_one(output, IVI_SURFACE_ROLE_REMOTE) ||
+ ivi_surface_count_one(output, IVI_SURFACE_ROLE_DESKTOP))