old
/
entrance
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

entrance: some little fix 

SVN revision: 76893
This commit is contained in:
Michael BOUCHAUD 2012-09-20 08:23:51 +00:00
parent c533399003
commit 96e12216a7
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/entrance_connect.c
View File

@ -11,20 +11,16 @@ static Eina_Bool _entrance_connect_data(void *data, int type, void *event);
static Eina_Bool
_entrance_connect_add(void *data __UNUSED__, int type __UNUSED__, void *event)
_entrance_connect_add(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
Ecore_Con_Event_Server_Add *ev;
ev = event;
PT("connected\n");
return ECORE_CALLBACK_RENEW;
}
static Eina_Bool
_entrance_connect_del(void *data __UNUSED__, int type __UNUSED__, void *event)
_entrance_connect_del(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{
Ecore_Con_Event_Server_Del *ev;
ev = event;
PT("disconnected\n");
_entrance_connect = NULL;

21
src/daemon/entrance.c
View File

@ -366,6 +366,20 @@ main (int argc, char ** argv)
efreet_shutdown();
ecore_shutdown();
PT("ecore shutdown\n");
if (entrance_session_logged_get())
{
entrance_config_shutdown();
PT("config shutdown\n");
entrance_session_shutdown();
PT("session shutdown\n");
eet_shutdown();
PT("eet shutdown\n");
free(dname);
PT("Bye user logged, see you.\n");
entrance_close_log();
_entrance_wait();
}
_remove_lock();
entrance_config_shutdown();
PT("config shutdown\n");
entrance_session_shutdown();
@ -373,18 +387,11 @@ main (int argc, char ** argv)
eet_shutdown();
PT("eet shutdown\n");
free(dname);
if (entrance_session_logged_get())
{
PT("Bye user logged, see you.\n");
entrance_close_log();
_entrance_wait();
}
PT("ending xserver\n");
kill(pid, SIGTERM);
entrance_xserver_end();
PT("Bye, see you.\n\n");
entrance_close_log();
_remove_lock();
return 0;
}