enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 13
Code Issues 26 Pull Requests 2 Projects Releases Wiki Activity

e/wizard: check for efreet cache error 

Makes wizard not hang if we have no efreet daemon

SVN revision: 80451
This commit is contained in:
Sebastian Dransfeld 2012-12-07 13:31:58 +00:00
parent 82b4efa5e4
commit e8f070067a
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/wizard/e_wizard.c
View File

@ -25,6 +25,9 @@ static int next_can = 0;
static Eina_List *handlers = NULL;
static Eina_Bool got_desktops = EINA_FALSE;
static Eina_Bool got_icons = EINA_FALSE;
#if (EFREET_VERSION_MAJOR > 1) || (EFREET_VERSION_MINOR >= 8)
static Eina_Bool xdg_error = EINA_FALSE;
#endif
static Eina_Bool need_xdg_desktops = EINA_FALSE;
static Eina_Bool need_xdg_icons = EINA_FALSE;
@ -238,6 +241,9 @@ e_wizard_dir_get(void)
EAPI void
e_wizard_xdg_desktops_reset(void)
{
#if (EFREET_VERSION_MAJOR > 1) || (EFREET_VERSION_MINOR >= 8)
if (xdg_error) return;
#endif
got_desktops = EINA_FALSE;
}
@ -442,8 +448,15 @@ _e_wizard_cb_next_page(void *data __UNUSED__)
static Eina_Bool
_e_wizard_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
_e_wizard_cb_desktops_update(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
{
#if (EFREET_VERSION_MAJOR > 1) || (EFREET_VERSION_MINOR >= 8)
Efreet_Event_Cache_Update *e;
e = ev;
xdg_error = !!e->error;
#endif
got_desktops = EINA_TRUE;
if (_e_wizard_check_xdg())
_e_wizard_next_xdg();