entrance: those things are not needed anymore!

devs/bu5hm4n/develop
Marcel Hollerbach 8 years ago
parent 28d5a00f35
commit a02f0dcff7
  1. 9
      src/bin/entrance_gui.c
  2. 1
      src/daemon/entrance_server.c
  3. 21
      src/event/entrance_event.c
  4. 8
      src/event/entrance_event.h

@ -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

@ -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;
}

@ -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;
}

@ -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_

Loading…
Cancel
Save