X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=dfcc24dce5d3d8f5f78a77ac0a12ed28e486c44c;hb=refs%2Fchanges%2F69%2F28069%2F2;hp=f28d0c9dc9f0e3289b8892009a57f582ee2a6555;hpb=0512e7251611e7040c550bb4c6cc972d57b45144;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index f28d0c9..dfcc24d 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -369,10 +369,8 @@ skip_output_asignment:
 	if (app_id && output) {
 		shell_advertise_app_state(output->ivi, app_id,
 					  NULL, AGL_SHELL_DESKTOP_APP_STATE_DESTROYED);
-
-		if (wl_resource_get_version(output->ivi->shell_client.resource) >= AGL_SHELL_APP_STATE_SINCE_VERSION)
-			agl_shell_send_app_state(output->ivi->shell_client.resource,
-						 app_id, AGL_SHELL_APP_STATE_TERMINATED);
+		if (output->ivi->shell_client.ready)
+			shell_send_app_state(output->ivi, app_id, AGL_SHELL_APP_STATE_TERMINATED);
 	}
 
 	wl_list_remove(&surface->link);
@@ -405,9 +403,7 @@ desktop_committed(struct weston_desktop_surface *dsurface,
 		/* we'll do it now at commit time, because we might not have an
 		 * appid by the time we've created the weston_desktop_surface
 		 * */
-		if (wl_resource_get_version(ivi->shell_client.resource) >= AGL_SHELL_APP_STATE_SINCE_VERSION)
-			agl_shell_send_app_state(ivi->shell_client.resource,
-						 app_id, AGL_SHELL_APP_STATE_STARTED);
+		shell_send_app_state(ivi, app_id, AGL_SHELL_APP_STATE_STARTED);
 	}
 
 	if (!surface->advertised_on_launch &&