forked from enlightenment/enlightenment
Changing the efsd launch code since we don't have --forcemode any more.
SVN revision: 4200
This commit is contained in:
parent
2be7b124ed
commit
b2eeab41a0
21
src/fs.c
21
src/fs.c
|
@ -112,23 +112,10 @@ e_fs_init(void)
|
||||||
{
|
{
|
||||||
/* start efsd */
|
/* start efsd */
|
||||||
e_exec_run("efsd");
|
e_exec_run("efsd");
|
||||||
for (i = 0; (!ec); i++)
|
for (i = 0; (!ec) && (i < 4); i++)
|
||||||
{
|
{
|
||||||
ec = efsd_open();
|
sleep(1);
|
||||||
sleep(1);
|
ec = efsd_open();
|
||||||
/* > than 4 seconds later efsd isnt there... try forced start */
|
|
||||||
if (i > 4)
|
|
||||||
{
|
|
||||||
e_exec_run("efsd --forcestart");
|
|
||||||
for (i = 0; (!ec); i++)
|
|
||||||
{
|
|
||||||
ec = efsd_open();
|
|
||||||
sleep(1);
|
|
||||||
/* > 4 seconds later forced efsd not alive - give up */
|
|
||||||
if (i > 4) break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* after several atempts to talk to efsd - lets give up */
|
/* after several atempts to talk to efsd - lets give up */
|
||||||
|
@ -137,7 +124,7 @@ e_fs_init(void)
|
||||||
fprintf(stderr, "efsd is not running - please run efsd.\n");
|
fprintf(stderr, "efsd is not running - please run efsd.\n");
|
||||||
exit(-1);
|
exit(-1);
|
||||||
}
|
}
|
||||||
e_add_event_fd(efsd_get_connection_fd(ec), _e_fs_fd_handle);
|
e_add_event_fd(efsd_get_connection_fd(ec), _e_fs_fd_handle_a_la_cK);
|
||||||
}
|
}
|
||||||
|
|
||||||
EfsdConnection *
|
EfsdConnection *
|
||||||
|
|
Loading…
Reference in New Issue