usergreen
/
terminology
forked from enlightenment/terminology
1
0
Fork 0
Code Pull Requests Activity

terminology: remove hack that's not needed anymore 

edbus doesn't crash efreet if the mainloop isn't ran anymore (see test in
edbus' testsuite) so lets remove the hack.



SVN revision: 82844
This commit is contained in:
Lucas De Marchi 2013-01-15 21:58:18 +00:00
parent bbd7701258
commit 84564c8f5d
1 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/bin/main.c
View File

@ -984,26 +984,6 @@ main_ipc_new(Ipc_Instance *inst)
free(nargv);
}
static void
_dummy_exit3(void *data __UNUSED__)
{
elm_exit();
}
static Eina_Bool
_dummy_exit2(void *data __UNUSED__)
{
ecore_job_add(_dummy_exit3, NULL);
return EINA_FALSE;
}
static Eina_Bool
_dummy_exit(void *data __UNUSED__)
{
ecore_idler_add(_dummy_exit2, NULL);
return EINA_FALSE;
}
static const char *emotion_choices[] = {
"auto", "gstreamer", "xine", "generic",
NULL
@ -1403,11 +1383,7 @@ remote:
inst.hold = hold;
inst.nowm = nowm;
if (ipc_instance_add(&inst))
{
ecore_timer_add(0.1, _dummy_exit, NULL);
elm_run();
goto end;
}
goto end;
}
if ((!single) && (config->multi_instance))
{
@ -1421,7 +1397,7 @@ remote:
}
}
}
wn = main_win_new(name, role, title, icon_name,
fullscreen, iconic, borderless, override, maximized);
// set an env so terminal apps can detect they are in terminology :)
@ -1435,7 +1411,7 @@ remote:
goto end;
}
wn->config = config;
term = main_term_new(wn, config, cmd, login_shell, cd, size_w, size_h,
hold);
if (!term)
@ -1453,7 +1429,7 @@ remote:
if (pos_set)
{
int screen_w, screen_h;
elm_win_screen_size_get(wn->win, NULL, NULL, &screen_w, &screen_h);
if (pos_x < 0) pos_x = screen_w + pos_x;
if (pos_y < 0) pos_y = screen_h + pos_y;
@ -1481,8 +1457,6 @@ remote:
eina_log_domain_unregister(_log_domain);
_log_domain = -1;
// efreet/edbus... you are being bad! :( disable shutdown for now
// to avoid segs.
elm_shutdown();
return retval;
}