From a02f0dcff7e19985a928e0ece61e18a5e5dc34d2 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 14 May 2014 17:26:52 +0200 Subject: [PATCH] entrance: those things are not needed anymore! --- src/bin/entrance_gui.c | 9 --------- src/daemon/entrance_server.c | 1 - src/event/entrance_event.c | 21 +-------------------- src/event/entrance_event.h | 8 -------- 4 files changed, 1 insertion(+), 38 deletions(-) diff --git a/src/bin/entrance_gui.c b/src/bin/entrance_gui.c index eb6260e..6292893 100644 --- a/src/bin/entrance_gui.c +++ b/src/bin/entrance_gui.c @@ -511,15 +511,6 @@ entrance_gui_pools_set(const Entrance_Pools *pool) free(img); } _gui->icon_pool = pool->icon_pool; - - EINA_LIST_FREE(_gui->user_pools, img) - { - eina_stringshare_del(img->path); - eina_stringshare_del(img->group); - free(img); - } - _gui->user_pools = pool->user_pools; - } void diff --git a/src/daemon/entrance_server.c b/src/daemon/entrance_server.c index 3351ee8..4e9b4f8 100644 --- a/src/daemon/entrance_server.c +++ b/src/daemon/entrance_server.c @@ -45,7 +45,6 @@ _entrance_server_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event E eev.type = ENTRANCE_EVENT_POOLS; eev.event.pools.icon_pool = entrance_image_system_icons(); eev.event.pools.background_pool = entrance_image_system_backgrounds(); - eev.event.pools.user_pools = NULL; entrance_event_send(&eev); return ECORE_CALLBACK_RENEW; } diff --git a/src/event/entrance_event.c b/src/event/entrance_event.c index 86cc111..82fdf6e 100644 --- a/src/event/entrance_event.c +++ b/src/event/entrance_event.c @@ -280,37 +280,18 @@ _entrance_event_action_dd(void) return edd; } static Eet_Data_Descriptor * -_entrance_event_user_pool_dd(void) -{ - Eet_Data_Descriptor *edd, *eddi; - Eet_Data_Descriptor_Class eddc; - EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Entrance_User_Pool); - edd = eet_data_descriptor_stream_new(&eddc); - eddi = _entrance_event_image_dd(); - EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Entrance_User_Pool, "name", - name, EET_T_STRING); - EET_DATA_DESCRIPTOR_ADD_LIST(edd, Entrance_User_Pool, "icon_pool", - icon_pool, eddi); - EET_DATA_DESCRIPTOR_ADD_LIST(edd, Entrance_User_Pool, "background_pool", - background_pool, eddi); - return edd; -} -static Eet_Data_Descriptor * _entrance_event_pools_dd(void) { - Eet_Data_Descriptor *edd, *eddi, *eddup; + Eet_Data_Descriptor *edd, *eddi; Eet_Data_Descriptor_Class eddc; EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Entrance_Pools); edd = eet_data_descriptor_stream_new(&eddc); eddi = _entrance_event_image_dd(); - eddup = _entrance_event_user_pool_dd(); EET_DATA_DESCRIPTOR_ADD_LIST(edd, Entrance_Pools, "icon_pool", icon_pool, eddi); EET_DATA_DESCRIPTOR_ADD_LIST(edd, Entrance_Pools, "background_pool", background_pool, eddi); - EET_DATA_DESCRIPTOR_ADD_LIST(edd, Entrance_Pools, "user_pools", - user_pools, eddup); return edd; } diff --git a/src/event/entrance_event.h b/src/event/entrance_event.h index ae0dfc1..7ff33be 100644 --- a/src/event/entrance_event.h +++ b/src/event/entrance_event.h @@ -98,18 +98,10 @@ typedef struct Entrance_Login_ Eina_List *background_pool; } Entrance_Login; -typedef struct Entrance_User_Pool_ -{ - const char *name; - Eina_List *icon_pool; - Eina_List *background_pool; -} Entrance_User_Pool; - typedef struct Entrance_Pools_ { Eina_List *icon_pool; Eina_List *background_pool; - Eina_List *user_pools; } Entrance_Pools; typedef struct Entrance_Event_