xdg_shell_v6: Ensure _toplevel_from_shell_surface_resource never fail

As long as the caller passes a correct resource, this function must not
fail.

Change-Id: I255e6227e7e8ebdbc6a277c1d09652d3808c3ab2

diff --git a/src/bin/server/e_desktop_xdg_shell_v6.c b/src/bin/server/e_desktop_xdg_shell_v6.c
index 230f9d390de0a501d4679093d43de27852d5381e..2b6b4dc9458ef5f305444c0ecdd95aa76ce71975 100644 (file)
--- a/src/bin/server/e_desktop_xdg_shell_v6.c
+++ b/src/bin/server/e_desktop_xdg_shell_v6.c
@@ -121,20 +121,14 @@ _shell_cb_new_surface(struct wl_listener *listener, void *data)
 static E_Desktop_Xdg_Toplevel_V6 *
 _toplevel_from_shell_surface_resource(struct wl_resource *shsurface_resource)
 {
+   struct ds_xdg_surface_v6 *ds_xdg_surface = ds_xdg_surface_v6_from_resource(shsurface_resource);
    E_Desktop_Xdg_Toplevel_V6 *toplevel;
-   struct ds_xdg_surface_v6 *ds_xdg_surface;
    struct wl_listener *listener;
 
-   ds_xdg_surface = ds_xdg_surface_v6_from_resource(shsurface_resource);
-   if (!ds_xdg_surface)
-     return NULL;
-
    listener = wl_signal_get(&ds_xdg_surface->events.destroy,
                             _toplevel_cb_xdg_surface_destroy);
-   if (listener)
-     return wl_container_of(listener, toplevel, destroy);
 
-   return NULL;
+   return wl_container_of(listener, toplevel, destroy);
 }
 
 static void