summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel-hollerbach@t-online.de>2014-05-14 17:26:52 +0200
committerMarcel Hollerbach <marcel-hollerbach@t-online.de>2014-05-14 17:26:52 +0200
commita02f0dcff7e19985a928e0ece61e18a5e5dc34d2 (patch)
treef3d587ba28958ac7aea46046ac172a15ceec3ed1
parent28d5a00f359e3d92ca994c1fe9a83d6507a8053f (diff)
entrance: those things are not needed anymore!
-rw-r--r--src/bin/entrance_gui.c9
-rw-r--r--src/daemon/entrance_server.c1
-rw-r--r--src/event/entrance_event.c21
-rw-r--r--src/event/entrance_event.h8
4 files changed, 1 insertions, 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)
511 free(img); 511 free(img);
512 } 512 }
513 _gui->icon_pool = pool->icon_pool; 513 _gui->icon_pool = pool->icon_pool;
514
515 EINA_LIST_FREE(_gui->user_pools, img)
516 {
517 eina_stringshare_del(img->path);
518 eina_stringshare_del(img->group);
519 free(img);
520 }
521 _gui->user_pools = pool->user_pools;
522
523} 514}
524 515
525void 516void
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
45 eev.type = ENTRANCE_EVENT_POOLS; 45 eev.type = ENTRANCE_EVENT_POOLS;
46 eev.event.pools.icon_pool = entrance_image_system_icons(); 46 eev.event.pools.icon_pool = entrance_image_system_icons();
47 eev.event.pools.background_pool = entrance_image_system_backgrounds(); 47 eev.event.pools.background_pool = entrance_image_system_backgrounds();
48 eev.event.pools.user_pools = NULL;
49 entrance_event_send(&eev); 48 entrance_event_send(&eev);
50 return ECORE_CALLBACK_RENEW; 49 return ECORE_CALLBACK_RENEW;
51} 50}
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)
280 return edd; 280 return edd;
281} 281}
282static Eet_Data_Descriptor * 282static Eet_Data_Descriptor *
283_entrance_event_user_pool_dd(void)
284{
285 Eet_Data_Descriptor *edd, *eddi;
286 Eet_Data_Descriptor_Class eddc;
287 EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Entrance_User_Pool);
288 edd = eet_data_descriptor_stream_new(&eddc);
289 eddi = _entrance_event_image_dd();
290 EET_DATA_DESCRIPTOR_ADD_BASIC(edd, Entrance_User_Pool, "name",
291 name, EET_T_STRING);
292 EET_DATA_DESCRIPTOR_ADD_LIST(edd, Entrance_User_Pool, "icon_pool",
293 icon_pool, eddi);
294 EET_DATA_DESCRIPTOR_ADD_LIST(edd, Entrance_User_Pool, "background_pool",
295 background_pool, eddi);
296 return edd;
297}
298static Eet_Data_Descriptor *
299_entrance_event_pools_dd(void) 283_entrance_event_pools_dd(void)
300{ 284{
301 Eet_Data_Descriptor *edd, *eddi, *eddup; 285 Eet_Data_Descriptor *edd, *eddi;
302 Eet_Data_Descriptor_Class eddc; 286 Eet_Data_Descriptor_Class eddc;
303 EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Entrance_Pools); 287 EET_EINA_STREAM_DATA_DESCRIPTOR_CLASS_SET(&eddc, Entrance_Pools);
304 edd = eet_data_descriptor_stream_new(&eddc); 288 edd = eet_data_descriptor_stream_new(&eddc);
305 eddi = _entrance_event_image_dd(); 289 eddi = _entrance_event_image_dd();
306 eddup = _entrance_event_user_pool_dd();
307 290
308 EET_DATA_DESCRIPTOR_ADD_LIST(edd, Entrance_Pools, "icon_pool", 291 EET_DATA_DESCRIPTOR_ADD_LIST(edd, Entrance_Pools, "icon_pool",
309 icon_pool, eddi); 292 icon_pool, eddi);
310 EET_DATA_DESCRIPTOR_ADD_LIST(edd, Entrance_Pools, "background_pool", 293 EET_DATA_DESCRIPTOR_ADD_LIST(edd, Entrance_Pools, "background_pool",
311 background_pool, eddi); 294 background_pool, eddi);
312 EET_DATA_DESCRIPTOR_ADD_LIST(edd, Entrance_Pools, "user_pools",
313 user_pools, eddup);
314 return edd; 295 return edd;
315} 296}
316 297
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_
98 Eina_List *background_pool; 98 Eina_List *background_pool;
99} Entrance_Login; 99} Entrance_Login;
100 100
101typedef struct Entrance_User_Pool_
102{
103 const char *name;
104 Eina_List *icon_pool;
105 Eina_List *background_pool;
106} Entrance_User_Pool;
107
108typedef struct Entrance_Pools_ 101typedef struct Entrance_Pools_
109{ 102{
110 Eina_List *icon_pool; 103 Eina_List *icon_pool;
111 Eina_List *background_pool; 104 Eina_List *background_pool;
112 Eina_List *user_pools;
113} Entrance_Pools; 105} Entrance_Pools;
114 106
115typedef struct Entrance_Event_ 107typedef struct Entrance_Event_