e_view_client: rename content_type_set

change the name of content_type_set to external_view_type_set

Change-Id: I2c6b2ff0e5fa3f344063fb3cdeea9400ceaf0573

diff --git a/src/bin/core/e_view_client.c b/src/bin/core/e_view_client.c
index 579cb88c6ed88e04e92b8cf920c768d994ef436e..2258caffcbce5e19dd696e278e16469a0e4d9adc 100644 (file)
--- a/src/bin/core/e_view_client.c
+++ b/src/bin/core/e_view_client.c
@@ -1056,7 +1056,7 @@ e_view_client_render_op_set_listener_add(E_View_Client *client, struct wl_listen
 }
 
 EINTERN void
-e_view_client_content_type_set_listener_add(E_View_Client *client, struct wl_listener *listener)
+e_view_client_external_view_set_listener_add(E_View_Client *client, struct wl_listener *listener)
 {
    if (client == NULL) return;
 

diff --git a/src/bin/core/e_view_client_intern.h b/src/bin/core/e_view_client_intern.h
index dabefae2d740e894293b06ace9cfdbc98c045a7b..e9d987f51877a5ca55d05916ffe2e4b89827de9d 100644 (file)
--- a/src/bin/core/e_view_client_intern.h
+++ b/src/bin/core/e_view_client_intern.h
@@ -62,7 +62,7 @@ void e_view_client_stack_above_listener_add(E_View_Client *client, struct wl_lis
 void e_view_client_stack_below_listener_add(E_View_Client *client, struct wl_listener *listener);
 void e_view_client_image_filter_set_listener_add(E_View_Client *client, struct wl_listener *listener);
 void e_view_client_render_op_set_listener_add(E_View_Client *client, struct wl_listener *listener);
-void e_view_client_content_type_set_listener_add(E_View_Client *client, struct wl_listener *listener);
+void e_view_client_external_view_set_listener_add(E_View_Client *client, struct wl_listener *listener);
 void e_view_client_color_set_listener_add(E_View_Client *client, struct wl_listener *listener);
 void e_view_client_color_visible_set_listener_add(E_View_Client *client, struct wl_listener *listener);
 

diff --git a/src/bin/displaymgr/e_hwc_window.c b/src/bin/displaymgr/e_hwc_window.c
index 0123183e2d7782b8c575d5a592422da1aa8e64be..a278eeaea633c0b14fa70b158557695e1275e54c 100644 (file)
--- a/src/bin/displaymgr/e_hwc_window.c
+++ b/src/bin/displaymgr/e_hwc_window.c
@@ -892,8 +892,8 @@ _e_hwc_window_del(E_Hwc_Window *hwc_window)
    if (hwc_window->render_op_set_listener.notify)
      wl_list_remove(&hwc_window->render_op_set_listener.link);
 
-   if (hwc_window->content_type_set_listener.notify)
-     wl_list_remove(&hwc_window->content_type_set_listener.link);
+   if (hwc_window->view_client_external_view_type_set_listener.notify)
+     wl_list_remove(&hwc_window->view_client_external_view_type_set_listener.link);
 
    if (hwc_window->color_set_listener.notify)
      wl_list_remove(&hwc_window->color_set_listener.link);
@@ -954,11 +954,11 @@ _e_hwc_window_cb_render_op_set(struct wl_listener *listener, void *data)
 }
 
 static void
-_e_hwc_window_cb_content_type_set(struct wl_listener *listener, void *data)
+_e_hwc_window_cb_view_client_external_view_type_set(struct wl_listener *listener, void *data)
 {
    E_Hwc_Window *hwc_window;
 
-   hwc_window = container_of(listener, E_Hwc_Window, content_type_set_listener);
+   hwc_window = container_of(listener, E_Hwc_Window, view_client_external_view_type_set_listener);
    if (!hwc_window->ec) return;
 
    if (e_view_client_external_view_type_get(e_client_view_get(hwc_window->ec)) != E_VIEW_CLIENT_EXTERNAL_VIEW_TYPE_NONE)
@@ -1212,8 +1212,8 @@ _e_hwc_window_new(E_Hwc *hwc, E_Client *ec, E_Hwc_Window_State state)
    hwc_window->render_op_set_listener.notify = _e_hwc_window_cb_render_op_set;
    e_view_client_render_op_set_listener_add(e_client_view_get(ec), &hwc_window->render_op_set_listener);
 
-   hwc_window->content_type_set_listener.notify = _e_hwc_window_cb_content_type_set;
-   e_view_client_content_type_set_listener_add(e_client_view_get(ec), &hwc_window->content_type_set_listener);
+   hwc_window->view_client_external_view_type_set_listener.notify = _e_hwc_window_cb_view_client_external_view_type_set;
+   e_view_client_external_view_set_listener_add(e_client_view_get(ec), &hwc_window->view_client_external_view_type_set_listener);
 
    hwc_window->color_set_listener.notify = _e_hwc_window_cb_color_set;
    e_view_client_color_set_listener_add(e_client_view_get(ec), &hwc_window->color_set_listener);

diff --git a/src/bin/displaymgr/e_hwc_window_intern.h b/src/bin/displaymgr/e_hwc_window_intern.h
index 52d479cdc7c87059001453be2c49d7b41c655d72..a4bff8e7a8435aa331a03021dfbbafd729caf6a0 100644 (file)
--- a/src/bin/displaymgr/e_hwc_window_intern.h
+++ b/src/bin/displaymgr/e_hwc_window_intern.h
@@ -159,7 +159,7 @@ struct _E_Hwc_Window
 
    struct wl_listener             image_filter_set_listener;
    struct wl_listener             render_op_set_listener;
-   struct wl_listener             content_type_set_listener;
+   struct wl_listener             view_client_external_view_type_set_listener;
    struct wl_listener             color_set_listener;
    struct wl_listener             color_visible_set_listener;