X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fshell.c;h=c089bec51b1ef23a68d664d579b02a5f2acacaa9;hb=refs%2Fchanges%2F48%2F29548%2F1;hp=51578300d0bedc6e96eac6cd990d51625c5bbcf4;hpb=675456391e4f74559661206ec919cb5f6cb46f69;p=src%2Fagl-compositor.git

diff --git a/src/shell.c b/src/shell.c
index 5157830..c089bec 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1108,8 +1108,8 @@ shell_ready(struct wl_client *client, struct wl_resource *shell_res)
 	    ivi->shell_client.status == BOUND_FAILED) {
 		wl_resource_post_error(shell_res,
 				       WL_DISPLAY_ERROR_INVALID_OBJECT,
-				       "agl_shell has already been bound. "
-				       "Check out bound_fail event");
+				       "agl_shell (ready quest) has already "
+				       "been bound. Check out bound_fail event");
 		return;
 	}
 
@@ -1165,8 +1165,8 @@ shell_set_background(struct wl_client *client,
 	    ivi->shell_client.resource_ext == shell_res) {
 		wl_resource_post_error(shell_res,
 				       WL_DISPLAY_ERROR_INVALID_OBJECT,
-				       "agl_shell has already been bound. "
-				       "Check out bound_fail event");
+				       "agl_shell (set_background) has already "
+				       "been bound. Check out bound_fail event");
 		return;
 	}
 
@@ -1230,7 +1230,7 @@ shell_set_panel(struct wl_client *client,
 	    ivi->shell_client.resource_ext == shell_res) {
 		wl_resource_post_error(shell_res,
 				       WL_DISPLAY_ERROR_INVALID_OBJECT,
-				       "agl_shell has already been bound. "
+				       "agl_shell (set_panel) has already been bound. "
 				       "Check out bound_fail event");
 		return;
 	}
@@ -1860,6 +1860,7 @@ unbind_agl_shell(struct wl_resource *resource)
 
 	ivi->shell_client.ready = false;
 	ivi->shell_client.resource = NULL;
+	ivi->shell_client.resource_ext = NULL;
 	ivi->shell_client.client = NULL;
 }
 
@@ -1869,6 +1870,7 @@ unbind_agl_shell_ext(struct wl_resource *resource)
 	struct ivi_compositor *ivi = wl_resource_get_user_data(resource);
 
 	ivi->shell_client_ext.resource = NULL;
+	ivi->shell_client.resource_ext = NULL;
 }
 
 static void