X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fdesktop.c;h=b9e45da94eb2566ae6ee58a91cfe31aacbf58d41;hb=refs%2Fchanges%2F55%2F24655%2F2;hp=7502d6cb38b5b0b913ad5dd261e789eb1eb99c55;hpb=a9ae8d75026b1fa1ef32d143da23bc8ee9aedeaa;p=src%2Fagl-compositor.git

diff --git a/src/desktop.c b/src/desktop.c
index 7502d6c..b9e45da 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -112,19 +112,8 @@ desktop_surface_removed(struct weston_desktop_surface *dsurface, void *userdata)
 	struct weston_surface *wsurface =
 		weston_desktop_surface_get_surface(dsurface);
 
-	struct ivi_output *output;
-
-	if (surface->role == IVI_SURFACE_ROLE_DESKTOP)
-		output = surface->desktop.last_output;
-	else if (surface->role == IVI_SURFACE_ROLE_POPUP)
-		output = surface->popup.output;
-	else if (surface->role == IVI_SURFACE_ROLE_SPLIT_H ||
-		 surface->role == IVI_SURFACE_ROLE_SPLIT_V)
-		output = surface->split.output;
-	else if (surface->role == IVI_SURFACE_ROLE_FULLSCREEN)
-		output = surface->fullscreen.output;
-	else
-		return;
+	struct ivi_output *output = ivi_layout_get_output_from_surface(surface);
+	assert(output != NULL);
 
 	/* resize the active surface to the original size */
 	if (surface->role == IVI_SURFACE_ROLE_SPLIT_H ||
@@ -192,6 +181,7 @@ desktop_committed(struct weston_desktop_surface *dsurface,
 
 	switch (surface->role) {
 	case IVI_SURFACE_ROLE_DESKTOP:
+	case IVI_SURFACE_ROLE_REMOTE:
 		ivi_layout_desktop_committed(surface);
 		break;
 	case IVI_SURFACE_ROLE_PANEL: