entrance: now the pools are set correctly.
This commit is contained in:
parent
aede9bef80
commit
c810ebf057
|
@ -458,7 +458,7 @@ entrance_gui_xsessions_get(void)
|
||||||
void
|
void
|
||||||
entrance_gui_conf_set(const Entrance_Conf_Gui_Event *conf)
|
entrance_gui_conf_set(const Entrance_Conf_Gui_Event *conf)
|
||||||
{
|
{
|
||||||
if (_gui->background_pool)
|
if (_gui->background_pool && conf->background_pool)
|
||||||
{
|
{
|
||||||
Entrance_Image *img;
|
Entrance_Image *img;
|
||||||
EINA_LIST_FREE(_gui->background_pool, img)
|
EINA_LIST_FREE(_gui->background_pool, img)
|
||||||
|
@ -467,9 +467,10 @@ entrance_gui_conf_set(const Entrance_Conf_Gui_Event *conf)
|
||||||
eina_stringshare_del(img->group);
|
eina_stringshare_del(img->group);
|
||||||
free(img);
|
free(img);
|
||||||
}
|
}
|
||||||
_gui->background_pool = conf->background_pool;
|
|
||||||
}
|
}
|
||||||
if (_gui->icon_pool)
|
if (conf->background_pool)
|
||||||
|
_gui->background_pool = conf->background_pool;
|
||||||
|
if (_gui->icon_pool && conf->icon_pool)
|
||||||
{
|
{
|
||||||
Entrance_Image *img;
|
Entrance_Image *img;
|
||||||
EINA_LIST_FREE(_gui->icon_pool, img)
|
EINA_LIST_FREE(_gui->icon_pool, img)
|
||||||
|
@ -478,8 +479,9 @@ entrance_gui_conf_set(const Entrance_Conf_Gui_Event *conf)
|
||||||
eina_stringshare_del(img->group);
|
eina_stringshare_del(img->group);
|
||||||
free(img);
|
free(img);
|
||||||
}
|
}
|
||||||
_gui->icon_pool = conf->icon_pool;
|
|
||||||
}
|
}
|
||||||
|
if (conf->icon_pool)
|
||||||
|
_gui->icon_pool = conf->icon_pool;
|
||||||
if (_gui->bg.path != conf->bg.path)
|
if (_gui->bg.path != conf->bg.path)
|
||||||
{
|
{
|
||||||
if ((conf->bg.path) && (*conf->bg.path))
|
if ((conf->bg.path) && (*conf->bg.path))
|
||||||
|
|
Loading…
Reference in New Issue