e_desk: remove the unused E_EVENT_DESKs

Change-Id: I8c84f471614f9cce94720edb6fe5cb2f772f8a5c

diff --git a/src/bin/core/e_desk.c b/src/bin/core/e_desk.c
index ac1a2a3d1bd586a7208e851a5e0ada287900cfec..9a8be81161b14f5046f79e606d319f4eb16c1c50 100644 (file)
--- a/src/bin/core/e_desk.c
+++ b/src/bin/core/e_desk.c
@@ -40,7 +40,6 @@ struct _E_Desk_Private
         struct wl_signal desk_area_active_change;
         struct wl_signal desk_new;
         struct wl_signal desk_free;
-        struct wl_signal name_set;
         struct wl_signal desk_show;
         struct wl_signal geometry_set;
         struct wl_signal zoom_set;
@@ -68,10 +67,6 @@ struct _E_Desk_Private
 
 static void      _e_desk_free(E_Desk *desk);
 
-EINTERN int E_EVENT_DESK_SHOW = 0;
-EINTERN int E_EVENT_DESK_BEFORE_SHOW = 0;
-EINTERN int E_EVENT_DESK_AFTER_SHOW = 0;
-EINTERN int E_EVENT_DESK_NAME_CHANGE = 0;
 E_API int E_EVENT_DESK_GEOMETRY_CHANGE = 0;
 E_API int E_EVENT_DESK_ZOOM_SET = 0;
 E_API int E_EVENT_DESK_ZOOM_UNSET = 0;
@@ -95,7 +90,6 @@ _e_desk_private_init(E_Desk *desk)
    wl_signal_init(&priv->events.desk_area_active_change);
    wl_signal_init(&priv->events.desk_new);
    wl_signal_init(&priv->events.desk_free);
-   wl_signal_init(&priv->events.name_set);
    wl_signal_init(&priv->events.desk_show);
    wl_signal_init(&priv->events.geometry_set);
    wl_signal_init(&priv->events.zoom_set);
@@ -142,10 +136,6 @@ _e_desk_private_finish(E_Desk *desk)
 EINTERN int
 e_desk_init(void)
 {
-   E_EVENT_DESK_SHOW = ecore_event_type_new();
-   E_EVENT_DESK_BEFORE_SHOW = ecore_event_type_new();
-   E_EVENT_DESK_AFTER_SHOW = ecore_event_type_new();
-   E_EVENT_DESK_NAME_CHANGE = ecore_event_type_new();
    E_EVENT_DESK_GEOMETRY_CHANGE = ecore_event_type_new();
    E_EVENT_DESK_ZOOM_SET = ecore_event_type_new();
    E_EVENT_DESK_ZOOM_UNSET  = ecore_event_type_new();
@@ -191,8 +181,6 @@ e_desk_name_set(E_Desk *desk, const char *name)
    E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
 
    eina_stringshare_replace(&desk->name, name);
-
-   wl_signal_emit(&PRI(desk)->events.name_set, NULL);
 }
 
 EINTERN void
@@ -781,13 +769,6 @@ e_desk_desk_free_listener_add(E_Desk *desk, struct wl_listener *listener)
    wl_signal_add(&priv->events.desk_free, listener);
 }
 
-EINTERN void
-e_desk_name_set_listener_add(E_Desk *desk, struct wl_listener *listener)
-{
-   API_ENTRY;
-   wl_signal_add(&priv->events.name_set, listener);
-}
-
 EINTERN void
 e_desk_desk_show_listener_add(E_Desk *desk, struct wl_listener *listener)
 {

diff --git a/src/bin/core/e_desk_intern.h b/src/bin/core/e_desk_intern.h
index 96c6a3f5187e65d9e70f556449c0c013a13c9735..fa28a3ebd5e78cad286d292eb0ad8711bc36b7d0 100644 (file)
--- a/src/bin/core/e_desk_intern.h
+++ b/src/bin/core/e_desk_intern.h
@@ -76,11 +76,6 @@ typedef struct _E_Desk_Data_Has_EC
    Eina_Bool has_ec;
 } E_Desk_Data_Has_EC;
 
-extern EINTERN int E_EVENT_DESK_SHOW;
-extern EINTERN int E_EVENT_DESK_BEFORE_SHOW;
-extern EINTERN int E_EVENT_DESK_AFTER_SHOW;
-extern EINTERN int E_EVENT_DESK_NAME_CHANGE;
-
 EINTERN int          e_desk_init(void);
 EINTERN int          e_desk_shutdown(void);
 EINTERN E_Desk      *e_desk_new(E_Zone *zone, int id);
@@ -121,7 +116,6 @@ EINTERN void e_desk_desk_area_active_change_listener_add(E_Desk *desk, struct wl
 
 EINTERN void e_desk_desk_new_listener_add(E_Desk *desk, struct wl_listener *listener);
 EINTERN void e_desk_desk_free_listener_add(E_Desk *desk, struct wl_listener *listener);
-EINTERN void e_desk_name_set_listener_add(E_Desk *desk, struct wl_listener *listener);
 EINTERN void e_desk_desk_show_listener_add(E_Desk *desk, struct wl_listener *listener);
 EINTERN void e_desk_geometry_set_listener_add(E_Desk *desk, struct wl_listener *listener);
 EINTERN void e_desk_zoom_set_listener_add(E_Desk *desk, struct wl_listener *listener);

diff --git a/src/bin/windowmgr/e_policy_desk.c b/src/bin/windowmgr/e_policy_desk.c
index d3c4e18437fa9da73669a2c60beb2907abdd271c..178f0644f81930e82e934a3b24f75a3f12b34941 100644 (file)
--- a/src/bin/windowmgr/e_policy_desk.c
+++ b/src/bin/windowmgr/e_policy_desk.c
@@ -50,7 +50,6 @@ struct _E_Policy_Desk
    struct wl_listener policy_desk_area_client_add;
    struct wl_listener desk_free;
    struct wl_listener top_visible_get;
-   struct wl_listener name_set;
    struct wl_listener name_add;
    struct wl_listener name_del;
    struct wl_listener name_update;
@@ -785,26 +784,12 @@ _e_policy_desk_cb_desk_free(struct wl_listener *listener, void *data)
    E_FREE_LIST(desk->handlers, ecore_event_handler_del);
 }
 
-static void
-_e_policy_desk_cb_name_set(struct wl_listener *listener, void *data)
-{
-   E_Policy_Desk *pd;
-   E_Desk *desk;
-
-   pd = wl_container_of(listener, pd, name_set);
-   desk = pd->desk;
-
-   _e_policy_desk_event_simple_add(desk, E_EVENT_DESK_NAME_CHANGE);
-}
-
 static void
 _e_policy_desk_cb_desk_show(struct wl_listener *listener, void *data)
 {
    E_Policy_Desk *pd;
    E_Desk *desk;
    E_Desk *desk2 = NULL;
-   Ecore_Event *eev_ecore_event = NULL;
-   Ecore_Event *ev_ecore_event = NULL;
 
    pd = wl_container_of(listener, pd, desk_show);
    desk = pd->desk;
@@ -812,9 +797,6 @@ _e_policy_desk_cb_desk_show(struct wl_listener *listener, void *data)
    desk2 = e_desk_current_get(pd->zone);
    if ((!starting) && (desk2) && (!desk2->visible) && (desk != desk2)) return;
 
-   eev_ecore_event = _e_policy_desk_event_simple_add(desk, E_EVENT_DESK_BEFORE_SHOW);
-   if (!eev_ecore_event) goto error;
-
    if (desk2 && desk2->visible)
      {
         desk2->visible = 0;
@@ -830,15 +812,7 @@ _e_policy_desk_cb_desk_show(struct wl_listener *listener, void *data)
    if (desk->smart_obj)
      evas_object_show(desk->smart_obj);
 
-   ev_ecore_event = _e_policy_desk_event_simple_add(desk, E_EVENT_DESK_SHOW);
-   if (!ev_ecore_event) goto error;
-
-   _e_policy_desk_event_simple_add(e_desk_current_get(desk->zone), E_EVENT_DESK_AFTER_SHOW);
-
    return;
-
-error:
-   if (eev_ecore_event) ecore_event_del(eev_ecore_event);
 }
 
 static void
@@ -2016,8 +1990,6 @@ e_policy_desk_new(E_Desk *desk)
    //e_desk_desk_new_listener_add(pd->desk, &pd->desk_new);
    pd->desk_free.notify = _e_policy_desk_cb_desk_free;
    e_desk_desk_free_listener_add(pd->desk, &pd->desk_free);
-   pd->name_set.notify = _e_policy_desk_cb_name_set;
-   e_desk_name_set_listener_add(pd->desk, &pd->name_set);
    pd->desk_show.notify = _e_policy_desk_cb_desk_show;
    e_desk_desk_show_listener_add(pd->desk, &pd->desk_show);
    pd->desk_client_add.notify = _e_policy_desk_cb_desk_client_add;
@@ -2082,7 +2054,6 @@ e_policy_desk_del(E_Policy_Desk *pd)
 
    // desk listeners
    wl_list_remove(&pd->desk_free.link);
-   wl_list_remove(&pd->name_set.link);
    wl_list_remove(&pd->desk_show.link);
    wl_list_remove(&pd->desk_client_add.link);
    wl_list_remove(&pd->desk_client_del.link);

diff --git a/src/include/e_desk.h b/src/include/e_desk.h
index d5023ca2228da14cdd192c34e0e95e021fb3e7b2..548ba24224deef83097e4110271a12e9b5942acb 100644 (file)
--- a/src/include/e_desk.h
+++ b/src/include/e_desk.h
@@ -12,11 +12,6 @@ extern "C" {
 typedef struct _E_Desk_Hook E_Desk_Hook;
 
 typedef struct _E_Event_Desk E_Event_Desk;
-typedef struct _E_Event_Desk E_Event_Desk_Show;
-typedef struct _E_Event_Desk E_Event_Desk_Before_Show;
-typedef struct _E_Event_Desk E_Event_Desk_After_Show;
-typedef struct _E_Event_Desk E_Event_Desk_Name_Change;
-typedef struct _E_Event_Desk E_Event_Desk_Window_Profile_Change;
 typedef struct _E_Event_Desk E_Event_Desk_Zoom_Set;
 typedef struct _E_Event_Desk E_Event_Desk_Zoom_Unset;
 typedef struct _E_Event_Desk_Geometry_Change E_Event_Desk_Geometry_Change;