X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fshell.c;h=94fdb669aae8c21fe1605675b3cc320353ef3254;hb=refs%2Fchanges%2F56%2F25356%2F3;hp=82cc1d30c0946d1ed1668a0b0040c3d8f37be7c2;hpb=bbf173123cdd4c64330fbf77631a9ae120e7d09f;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index 82cc1d3..94fdb66 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -55,6 +55,10 @@ agl_shell_desktop_advertise_application_id(struct ivi_compositor *ivi,
 	wl_list_for_each(dclient, &ivi->desktop_clients, link) {
 		const char *app_id =
 			weston_desktop_surface_get_app_id(surface->dsurface);
+		if (app_id == NULL) {
+			weston_log("WARNING app_is is null, unable to advertise\n");
+			return;
+		}
 		agl_shell_desktop_send_application(dclient->resource, app_id);
 	}
 }
@@ -264,7 +268,7 @@ ivi_check_pending_desktop_surface_popup(struct ivi_surface *surface)
 	const char *_app_id =
 			weston_desktop_surface_get_app_id(surface->dsurface);
 
-	if (wl_list_empty(&ivi->popup_pending_apps))
+	if (wl_list_empty(&ivi->popup_pending_apps) || !_app_id)
 		return false;
 
 	wl_list_for_each_safe(p_popup, next_p_popup,
@@ -295,7 +299,7 @@ ivi_check_pending_desktop_surface_split(struct ivi_surface *surface)
 	const char *_app_id =
 			weston_desktop_surface_get_app_id(surface->dsurface);
 
-	if (wl_list_empty(&ivi->split_pending_apps))
+	if (wl_list_empty(&ivi->split_pending_apps) || !_app_id)
 		return false;
 
 	wl_list_for_each_safe(split_surf, next_split_surf,
@@ -319,7 +323,7 @@ ivi_check_pending_desktop_surface_fullscreen(struct ivi_surface *surface)
 	const char *_app_id =
 			weston_desktop_surface_get_app_id(surface->dsurface);
 
-	if (wl_list_empty(&ivi->fullscreen_pending_apps))
+	if (wl_list_empty(&ivi->fullscreen_pending_apps) || !_app_id)
 		return false;
 
 	wl_list_for_each_safe(fs_surf, next_fs_surf,
@@ -342,7 +346,7 @@ ivi_check_pending_desktop_surface_remote(struct ivi_surface *surface)
 	const char *_app_id =
 		weston_desktop_surface_get_app_id(surface->dsurface);
 
-	if (wl_list_empty(&ivi->remote_pending_apps))
+	if (wl_list_empty(&ivi->remote_pending_apps) || !_app_id)
 		return false;
 
 	wl_list_for_each_safe(remote_surf, next_remote_surf,
@@ -366,24 +370,28 @@ ivi_check_pending_desktop_surface(struct ivi_surface *surface)
 	ret = ivi_check_pending_desktop_surface_popup(surface);
 	if (ret) {
 		ivi_set_desktop_surface_popup(surface);
+		ivi_layout_popup_committed(surface);
 		return;
 	}
 
 	ret = ivi_check_pending_desktop_surface_split(surface);
 	if (ret) {
 		ivi_set_desktop_surface_split(surface);
+		ivi_layout_split_committed(surface);
 		return;
 	}
 
 	ret = ivi_check_pending_desktop_surface_fullscreen(surface);
 	if (ret) {
 		ivi_set_desktop_surface_fullscreen(surface);
+		ivi_layout_fullscreen_committed(surface);
 		return;
 	}
 
 	ret = ivi_check_pending_desktop_surface_remote(surface);
 	if (ret) {
 		ivi_set_desktop_surface_remote(surface);
+		ivi_layout_desktop_committed(surface);
 		return;
 	}
 
@@ -438,6 +446,10 @@ ivi_shell_advertise_xdg_surfaces(struct ivi_compositor *ivi, struct wl_resource
 	wl_list_for_each(surface, &ivi->surfaces, link) {
 		const char *app_id =
 			weston_desktop_surface_get_app_id(surface->dsurface);
+		if (app_id == NULL) {
+			weston_log("WARNING app_is is null, unable to advertise\n");
+			return;
+		}
 		agl_shell_desktop_send_application(resource, app_id);
 	}
 }
@@ -789,8 +801,7 @@ shell_set_panel(struct wl_client *client,
 	weston_desktop_surface_set_size(dsurface, width, height);
 }
 
-
-static void
+void
 shell_advertise_app_state(struct ivi_compositor *ivi, const char *app_id,
 			  const char *data, uint32_t app_state)
 {
@@ -804,6 +815,9 @@ shell_advertise_app_state(struct ivi_compositor *ivi, const char *app_id,
 	if (!surf)
 		return;
 
+	if (!app_id)
+		return;
+
 	if (policy && policy->api.surface_advertise_state_change &&
 	    !policy->api.surface_advertise_state_change(surf, surf->ivi)) {
 		return;