Fix memory leaks 52/73852/3
authorJeongHyun Kang <jhyuni.kang@samsung.com>
Thu, 9 Jun 2016 22:29:33 +0000 (07:29 +0900)
committerGwanglim Lee <gl77.lee@samsung.com>
Tue, 14 Jun 2016 02:37:06 +0000 (19:37 -0700)
Change-Id: Id3eca407013058c6e659db19c0b1a8b5ff5b8359

src/bin/e_comp_wl.c
src/bin/e_comp_wl_input.c

index b1577eb..cd9f6bd 100644 (file)
@@ -4639,6 +4639,8 @@ e_comp_wl_shutdown(void)
    e_comp_wl_tbm_shutdown();
 #endif
 
+   e_comp_wl_input_shutdown();
+
    // TODO: yigl
 #if 0
    E_Comp_Wl_Output *output;
index 6e7d602..d114a28 100644 (file)
@@ -555,7 +555,6 @@ EINTERN void
 e_comp_wl_input_shutdown(void)
 {
    struct wl_resource *res;
-   E_Comp_Wl_Input_Device *dev;
 
    /* destroy pointer resources */
    EINA_LIST_FREE(e_comp_wl->ptr.resources, res)
@@ -595,22 +594,8 @@ e_comp_wl_input_shutdown(void)
      wl_global_destroy(e_comp_wl->seat.global);
    e_comp_wl->seat.global = NULL;
 
-   if (e_comp_wl->input_device_manager.global)
-     wl_global_destroy(e_comp_wl->input_device_manager.global);
-   e_comp_wl->input_device_manager.global = NULL;
-
-   if (e_comp_wl->input_device_manager.last_device_name)
-     eina_stringshare_del(e_comp_wl->input_device_manager.last_device_name);
-
    dont_set_ecore_drm_keymap = EINA_FALSE;
    dont_use_xkb_cache = EINA_FALSE;
-
-   EINA_LIST_FREE (e_comp_wl->input_device_manager.device_list, dev)
-     {
-        if (dev->name) eina_stringshare_del(dev->name);
-        if (dev->identifier) eina_stringshare_del(dev->identifier);
-        free(dev);
-     }
 }
 
 EINTERN Eina_Bool