enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests Projects Releases Wiki Activity

do only once ecore_con_(url_)init/shutdown()

This commit is contained in:
Boris Faure 2015-02-15 18:03:40 +01:00
parent ca2d7846a9
commit 6762578ace
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/main.c
View File

@ -922,8 +922,14 @@ remote:
ty_dbus_init();
ecore_con_init();
ecore_con_url_init();
elm_run();
ecore_con_url_shutdown();
ecore_con_shutdown();
ty_dbus_shutdown();
config = NULL;
end:

10
src/bin/media.c
View File

@ -866,8 +866,6 @@ _smart_del(Evas_Object *obj)
ecore_event_handler_del(sd->url_prog_hand);
ecore_event_handler_del(sd->url_compl_hand);
ecore_con_url_free(sd->url);
ecore_con_url_shutdown();
ecore_con_shutdown();
}
sd->url = NULL;
sd->url_prog_hand = NULL;
@ -1055,8 +1053,6 @@ _url_compl_cb(void *data, int type EINA_UNUSED, void *event_info)
ecore_event_handler_del(sd->url_prog_hand);
ecore_event_handler_del(sd->url_compl_hand);
ecore_con_url_free(sd->url);
ecore_con_url_shutdown();
ecore_con_shutdown();
sd->url = NULL;
sd->url_prog_hand = NULL;
sd->url_compl_hand = NULL;
@ -1210,15 +1206,11 @@ media_add(Evas_Object *parent, const char *src, const Config *config, int mode,
sd->tmpfd = mkstemps(buf, strlen(sd->ext));
if (sd->tmpfd >= 0)
{
ecore_con_init();
ecore_con_url_init();
sd->url = ecore_con_url_new(tbuf);
if (!sd->url)
{
unlink(buf);
close(sd->tmpfd);
ecore_con_url_shutdown();
ecore_con_shutdown();
}
else
{
@ -1227,8 +1219,6 @@ media_add(Evas_Object *parent, const char *src, const Config *config, int mode,
{
unlink(buf);
close(sd->tmpfd);
ecore_con_url_shutdown();
ecore_con_shutdown();
sd->url = NULL;
}
else