shutdown on restart needs some things to shut down, not all.
SVN revision: 20469
This commit is contained in:
parent
bac975332a
commit
16bec1dd21
|
@ -176,6 +176,24 @@ e_app_shutdown(void)
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EAPI void
|
||||||
|
e_app_unmonitor_all(void)
|
||||||
|
{
|
||||||
|
Evas_List *l;
|
||||||
|
|
||||||
|
for (l = _e_apps_list; l; l = l->next)
|
||||||
|
{
|
||||||
|
E_App *a;
|
||||||
|
|
||||||
|
a = l->data;
|
||||||
|
if (a->monitor)
|
||||||
|
{
|
||||||
|
ecore_file_monitor_del(a->monitor);
|
||||||
|
a->monitor = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
EAPI E_App *
|
EAPI E_App *
|
||||||
e_app_raw_new(void)
|
e_app_raw_new(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -89,6 +89,8 @@ struct _E_App_Autopsy
|
||||||
EAPI int e_app_init (void);
|
EAPI int e_app_init (void);
|
||||||
EAPI int e_app_shutdown (void);
|
EAPI int e_app_shutdown (void);
|
||||||
|
|
||||||
|
EAPI void e_app_unmonitor_all (void);
|
||||||
|
|
||||||
EAPI E_App *e_app_new (const char *path, int scan_subdirs);
|
EAPI E_App *e_app_new (const char *path, int scan_subdirs);
|
||||||
EAPI E_App *e_app_empty_new (const char *path);
|
EAPI E_App *e_app_empty_new (const char *path);
|
||||||
EAPI void e_app_image_size_set (E_App *a, int w, int h);
|
EAPI void e_app_image_size_set (E_App *a, int w, int h);
|
||||||
|
|
|
@ -712,6 +712,10 @@ main(int argc, char **argv)
|
||||||
/* if we were flagged to restart, then restart. */
|
/* if we were flagged to restart, then restart. */
|
||||||
if (restart)
|
if (restart)
|
||||||
{
|
{
|
||||||
|
/* selected shutdown */
|
||||||
|
e_app_unmonitor_all();
|
||||||
|
e_ipc_shutdown();
|
||||||
|
ecore_file_shutdown();
|
||||||
ecore_app_restart();
|
ecore_app_restart();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue