<div dir="ltr"><div>I squished in a little note for/from myself as to why this is OK. I pushed this one and the other 3<br></div>--Jason<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Aug 7, 2014 at 1:43 PM, Jasper St. Pierre <span dir="ltr"><<a href="mailto:jstpierre@mecheye.net" target="_blank">jstpierre@mecheye.net</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">An error makes the client exit, which cleans up the resources anyway.<br>
---<br>
desktop-shell/input-panel.c | 1 -<br>
desktop-shell/shell.c | 2 --<br>
src/screenshooter.c | 1 -<br>
src/text-backend.c | 2 --<br>
4 files changed, 6 deletions(-)<br>
<br>
diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c<br>
index 47bd73c..435cd5d 100644<br>
--- a/desktop-shell/input-panel.c<br>
+++ b/desktop-shell/input-panel.c<br>
@@ -356,7 +356,6 @@ bind_input_panel(struct wl_client *client,<br>
<br>
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,<br>
"interface object already bound");<br>
- wl_resource_destroy(resource);<br>
}<br>
<br>
void<br>
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c<br>
index 5a613f1..250cf88 100644<br>
--- a/desktop-shell/shell.c<br>
+++ b/desktop-shell/shell.c<br>
@@ -5347,7 +5347,6 @@ bind_desktop_shell(struct wl_client *client,<br>
<br>
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,<br>
"permission to bind desktop_shell denied");<br>
- wl_resource_destroy(resource);<br>
}<br>
<br>
static void<br>
@@ -5431,7 +5430,6 @@ bind_screensaver(struct wl_client *client,<br>
<br>
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,<br>
"interface object already bound");<br>
- wl_resource_destroy(resource);<br>
}<br>
<br>
struct switcher {<br>
diff --git a/src/screenshooter.c b/src/screenshooter.c<br>
index 369e920..9ae0d29 100644<br>
--- a/src/screenshooter.c<br>
+++ b/src/screenshooter.c<br>
@@ -265,7 +265,6 @@ bind_shooter(struct wl_client *client,<br>
if (client != shooter->client) {<br>
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,<br>
"screenshooter failed: permission denied");<br>
- wl_resource_destroy(resource);<br>
}<br>
<br>
wl_resource_set_implementation(resource, &screenshooter_implementation,<br>
diff --git a/src/text-backend.c b/src/text-backend.c<br>
index d6a6f3b..1d549d4 100644<br>
--- a/src/text-backend.c<br>
+++ b/src/text-backend.c<br>
@@ -790,14 +790,12 @@ bind_input_method(struct wl_client *client,<br>
if (input_method->input_method_binding != NULL) {<br>
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,<br>
"interface object already bound");<br>
- wl_resource_destroy(resource);<br>
return;<br>
}<br>
<br>
if (text_backend->input_method.client != client) {<br>
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,<br>
"permission to bind input_method denied");<br>
- wl_resource_destroy(resource);<br>
return;<br>
}<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.0.4<br>
<br>
_______________________________________________<br>
wayland-devel mailing list<br>
<a href="mailto:wayland-devel@lists.freedesktop.org">wayland-devel@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/wayland-devel" target="_blank">http://lists.freedesktop.org/mailman/listinfo/wayland-devel</a><br>
</font></span></blockquote></div><br></div>