Added destroy handler for wl_text_input interface 24/92124/3
authorJi-hoon Lee <dalton.lee@samsung.com>
Thu, 13 Oct 2016 07:42:47 +0000 (16:42 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Mon, 31 Oct 2016 00:48:49 +0000 (17:48 -0700)
Change-Id: I5208320866083476d1e741957c1679760f6343a4

src/e_mod_main.c

index 66757df5f252cdd84e5eda8a12a12990e0aea930..326a2c6210b611633b2afd968fcbf29b541fcf00 100644 (file)
@@ -1632,30 +1632,8 @@ _e_text_input_cb_get_hide_permission(struct wl_client *client EINA_UNUSED, struc
      wl_text_input_send_hide_permission(text_input->resource, permission);
 }
 
-static const struct wl_text_input_interface _e_text_input_implementation = {
-     _e_text_input_cb_activate,
-     _e_text_input_cb_deactivate,
-     _e_text_input_cb_input_panel_show,
-     _e_text_input_cb_input_panel_hide,
-     _e_text_input_cb_reset,
-     _e_text_input_cb_content_type_set,
-     _e_text_input_cb_cursor_rectangle_set,
-     _e_text_input_cb_preferred_language_set,
-     _e_text_input_cb_state_commit,
-     _e_text_input_cb_action_invoke,
-     _e_text_input_cb_return_key_type_set,
-     _e_text_input_cb_return_key_disabled_set,
-     _e_text_input_cb_input_panel_data_set,
-     _e_text_input_cb_bidi_direction_set,
-     _e_text_input_cb_cursor_position_set,
-     _e_text_input_cb_process_input_device_event,
-     _e_text_input_cb_filter_key_event,
-     _e_text_input_cb_reset_sync,
-     _e_text_input_cb_get_hide_permission
-};
-
 static void
-_e_text_input_cb_destroy(struct wl_resource *resource)
+_e_text_input_cb_resource_destroy(struct wl_resource *resource)
 {
    E_Text_Input *text_input = wl_resource_get_user_data(resource);
    E_Input_Method *input_method = NULL;
@@ -1688,6 +1666,35 @@ _e_text_input_cb_destroy(struct wl_resource *resource)
    free(text_input);
 }
 
+static void
+_e_text_input_cb_destroy(struct wl_client *client EINA_UNUSED, struct wl_resource *resource)
+{
+    wl_resource_destroy(resource);
+}
+
+static const struct wl_text_input_interface _e_text_input_implementation = {
+     _e_text_input_cb_destroy,
+     _e_text_input_cb_activate,
+     _e_text_input_cb_deactivate,
+     _e_text_input_cb_input_panel_show,
+     _e_text_input_cb_input_panel_hide,
+     _e_text_input_cb_reset,
+     _e_text_input_cb_content_type_set,
+     _e_text_input_cb_cursor_rectangle_set,
+     _e_text_input_cb_preferred_language_set,
+     _e_text_input_cb_state_commit,
+     _e_text_input_cb_action_invoke,
+     _e_text_input_cb_return_key_type_set,
+     _e_text_input_cb_return_key_disabled_set,
+     _e_text_input_cb_input_panel_data_set,
+     _e_text_input_cb_bidi_direction_set,
+     _e_text_input_cb_cursor_position_set,
+     _e_text_input_cb_process_input_device_event,
+     _e_text_input_cb_filter_key_event,
+     _e_text_input_cb_reset_sync,
+     _e_text_input_cb_get_hide_permission
+};
+
 static void
 _e_text_input_manager_cb_text_input_create(struct wl_client *client, struct wl_resource *resource, uint32_t id)
 {
@@ -1723,7 +1730,7 @@ _e_text_input_manager_cb_text_input_create(struct wl_client *client, struct wl_r
 
    wl_resource_set_implementation(text_input->resource,
                                   &_e_text_input_implementation,
-                                  text_input, _e_text_input_cb_destroy);
+                                  text_input, _e_text_input_cb_resource_destroy);
 }
 
 static const struct wl_text_input_manager_interface _e_text_input_manager_implementation = {