parent
c533399003
commit
96e12216a7
|
@ -11,20 +11,16 @@ static Eina_Bool _entrance_connect_data(void *data, int type, void *event);
|
||||||
|
|
||||||
|
|
||||||
static Eina_Bool
|
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");
|
PT("connected\n");
|
||||||
|
|
||||||
return ECORE_CALLBACK_RENEW;
|
return ECORE_CALLBACK_RENEW;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eina_Bool
|
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");
|
PT("disconnected\n");
|
||||||
_entrance_connect = NULL;
|
_entrance_connect = NULL;
|
||||||
|
|
||||||
|
|
|
@ -366,6 +366,20 @@ main (int argc, char ** argv)
|
||||||
efreet_shutdown();
|
efreet_shutdown();
|
||||||
ecore_shutdown();
|
ecore_shutdown();
|
||||||
PT("ecore shutdown\n");
|
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();
|
entrance_config_shutdown();
|
||||||
PT("config shutdown\n");
|
PT("config shutdown\n");
|
||||||
entrance_session_shutdown();
|
entrance_session_shutdown();
|
||||||
|
@ -373,18 +387,11 @@ main (int argc, char ** argv)
|
||||||
eet_shutdown();
|
eet_shutdown();
|
||||||
PT("eet shutdown\n");
|
PT("eet shutdown\n");
|
||||||
free(dname);
|
free(dname);
|
||||||
if (entrance_session_logged_get())
|
|
||||||
{
|
|
||||||
PT("Bye user logged, see you.\n");
|
|
||||||
entrance_close_log();
|
|
||||||
_entrance_wait();
|
|
||||||
}
|
|
||||||
PT("ending xserver\n");
|
PT("ending xserver\n");
|
||||||
kill(pid, SIGTERM);
|
kill(pid, SIGTERM);
|
||||||
entrance_xserver_end();
|
entrance_xserver_end();
|
||||||
PT("Bye, see you.\n\n");
|
PT("Bye, see you.\n\n");
|
||||||
entrance_close_log();
|
entrance_close_log();
|
||||||
_remove_lock();
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue