summaryrefslogtreecommitdiff
path: root/desktop-shell
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-08-07 16:43:12 -0400
committerJason Ekstrand <jason.ekstrand@intel.com>2014-08-08 14:57:17 -0700
commitc91408f3fb7e9a98e787e9f7e370b0298083431b (patch)
tree3751f5bc1fc74f67c89632ee335442e817b3f62e /desktop-shell
parent0013a29d5e8e9d25e8b3c5c6d672489ae4d7e943 (diff)
Don't bother destroying resources after sending an error
An error makes the client exit, which cleans up the resources anyway. Note (Jason Ekstrand): This is safe for two reasons. First, we should be handling object destruction nicely anyway. Second, in each of these cases, the resources don't have any implementation or destruction set so it has absolutely no effect on the rest of weston whether we destroy it now or later.
Diffstat (limited to 'desktop-shell')
-rw-r--r--desktop-shell/input-panel.c1
-rw-r--r--desktop-shell/shell.c2
2 files changed, 0 insertions, 3 deletions
diff --git a/desktop-shell/input-panel.c b/desktop-shell/input-panel.c
index 47bd73c1..435cd5d6 100644
--- a/desktop-shell/input-panel.c
+++ b/desktop-shell/input-panel.c
@@ -356,7 +356,6 @@ bind_input_panel(struct wl_client *client,
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
"interface object already bound");
- wl_resource_destroy(resource);
}
void
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
index 5a613f1e..250cf884 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -5347,7 +5347,6 @@ bind_desktop_shell(struct wl_client *client,
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
"permission to bind desktop_shell denied");
- wl_resource_destroy(resource);
}
static void
@@ -5431,7 +5430,6 @@ bind_screensaver(struct wl_client *client,
wl_resource_post_error(resource, WL_DISPLAY_ERROR_INVALID_OBJECT,
"interface object already bound");
- wl_resource_destroy(resource);
}
struct switcher {