vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use e_exec in action for exec. debugging printfs tew. 

SVN revision: 33990
This commit is contained in:
Carsten Haitzler 2008-03-12 07:31:13 +00:00
parent 167bc53a57
commit f6a2d93ced
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/e_actions.c
View File

@ -1478,15 +1478,15 @@ ACT_FN_GO_KEY(menu_show)
/***************************************************************************/
ACT_FN_GO(exec)
{
if (params)
E_Zone *zone;
zone = _e_actions_zone_get(obj);
if (zone)
{
Ecore_Exe *exe;
e_util_library_path_strip();
exe = ecore_exe_run(params, NULL);
e_util_library_path_restore();
e_exehist_add("action/exec", params);
if (exe) ecore_exe_free(exe);
if (params)
{
e_exec(zone, NULL, params, NULL, "action/exec");
}
}
}

22
src/bin/e_exec.c
View File

@ -266,7 +266,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
{
if (launch->launch_method) evas_stringshare_del(launch->launch_method);
if (launch->zone) e_object_unref(E_OBJECT(launch->zone));
free(launch);
free(launch);
}
return inst;
}
@ -290,12 +290,17 @@ _e_exec_cb_exit(void *data, int type, void *event)
E_Exec_Instance *inst;
ev = event;
printf("child exit...\n");
if (!ev->exe) return 1;
if (ecore_exe_tag_get(ev->exe)) printf(" tag %s\n", ecore_exe_tag_get(ev->exe));
if (!(ecore_exe_tag_get(ev->exe) &&
(!strcmp(ecore_exe_tag_get(ev->exe), "E/exec")))) return 1;
inst = ecore_exe_data_get(ev->exe);
printf(" inst = %p\n", inst);
if (!inst) return 1;
printf(" inst exec line -- '%s'\n", ecore_exe_cmd_get(inst->exe));
/* /bin/sh uses this if cmd not found */
if ((ev->exited) &&
((ev->exit_code == 127) || (ev->exit_code == 255)))
@ -331,14 +336,17 @@ _e_exec_cb_exit(void *data, int type, void *event)
ecore_exe_event_data_get(ev->exe, ECORE_EXE_PIPE_ERROR),
ecore_exe_event_data_get(ev->exe, ECORE_EXE_PIPE_READ));
}
instances = evas_hash_find(e_exec_instances, inst->desktop->orig_path);
if (instances)
if (inst->desktop)
{
instances = evas_list_remove(instances, inst);
instances = evas_hash_find(e_exec_instances, inst->desktop->orig_path);
if (instances)
evas_hash_modify(e_exec_instances, inst->desktop->orig_path, instances);
else
e_exec_instances = evas_hash_del(e_exec_instances, inst->desktop->orig_path, NULL);
{
instances = evas_list_remove(instances, inst);
if (instances)
evas_hash_modify(e_exec_instances, inst->desktop->orig_path, instances);
else
e_exec_instances = evas_hash_del(e_exec_instances, inst->desktop->orig_path, NULL);
}
}
e_exec_start_pending = evas_list_remove(e_exec_start_pending, inst->desktop);
if (inst->expire_timer) ecore_timer_del(inst->expire_timer);