enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

config to turn off exec fail dialog 

SVN revision: 45544
This commit is contained in:
Carsten Haitzler 2010-01-25 07:38:48 +00:00
parent 370822b80f
commit ca49f2dcbf
3 changed files with 65 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bin/e_config.c
View File

@ -743,6 +743,10 @@ e_config_init(void)
E_CONFIG_VAL(D, T, mode.presentation, UCHAR);
E_CONFIG_VAL(D, T, mode.offline, UCHAR);
E_CONFIG_VAL(D, T, exec.expire_timeout, DOUBLE);
E_CONFIG_VAL(D, T, exec.show_run_dialog, UCHAR);
E_CONFIG_VAL(D, T, exec.show_exit_dialog, UCHAR);
e_config_load();
e_config_save_queue();
@ -965,11 +969,6 @@ e_config_load(void)
COPYVAL(desklock_ask_presentation_timeout);
COPYVAL(screensaver_ask_presentation);
COPYVAL(screensaver_ask_presentation_timeout);
IFCFGELSE;
e_config->desklock_ask_presentation = 1;
e_config->desklock_ask_presentation_timeout = 30.0;
e_config->screensaver_ask_presentation = 1;
e_config->screensaver_ask_presentation_timeout = 30.0;
IFCFGEND;
IFCFG(0x0133);
@ -978,6 +977,12 @@ e_config_load(void)
COPYVAL(desk_flip_pan_y_axis_factor);
IFCFGEND;
IFCFG(0x0134);
COPYVAL(exec.expire_timeout);
COPYVAL(exec.show_run_dialog);
COPYVAL(exec.show_exit_dialog);
IFCFGEND;
e_config->config_version = E_CONFIG_FILE_VERSION;
_e_config_free(tcfg);
}
@ -1123,6 +1128,10 @@ e_config_load(void)
E_CONFIG_LIMIT(e_config->mode.presentation, 0, 1);
E_CONFIG_LIMIT(e_config->mode.offline, 0, 1);
E_CONFIG_LIMIT(e_config->exec.expire_timeout, 0.1, 1000);
E_CONFIG_LIMIT(e_config->exec.show_run_dialog, 0, 1);
E_CONFIG_LIMIT(e_config->exec.show_exit_dialog, 0, 1);
/* FIXME: disabled auto apply because it causes problems */
e_config->cfgdlg_auto_apply = 0;
/* FIXME: desklock personalized password id disabled for security reasons */

8
src/bin/e_config.h
View File

@ -35,7 +35,7 @@ typedef struct _E_Event_Config_Icon_Theme E_Event_Config_Icon_Theme;
/* increment this whenever a new set of config values are added but the users
* config doesn't need to be wiped - simply new values need to be put in
*/
#define E_CONFIG_FILE_GENERATION 0x0133
#define E_CONFIG_FILE_GENERATION 0x0134
#define E_CONFIG_FILE_VERSION ((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION)
#define E_EVAS_ENGINE_DEFAULT 0
@ -346,6 +346,12 @@ struct _E_Config
Eina_Bool presentation;
Eina_Bool offline;
} mode;
struct {
double expire_timeout;
Eina_Bool show_run_dialog;
Eina_Bool show_exit_dialog;
} exec;
};
struct _E_Config_Syscon_Action

12
src/bin/e_exec.c
View File

@ -248,7 +248,7 @@ _e_exec_cb_exec(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
inst->exe = exe;
inst->startup_id = startup_id;
inst->launch_time = ecore_time_get();
inst->expire_timer = ecore_timer_add(10.0,
inst->expire_timer = ecore_timer_add(e_config->exec.expire_timeout,
_e_exec_cb_expire_timer, inst);
l = eina_hash_find(e_exec_instances, desktop->orig_path);
@ -344,6 +344,8 @@ _e_exec_cb_exit(void *data, int type, void *event)
/* /bin/sh uses this if cmd not found */
if ((ev->exited) &&
((ev->exit_code == 127) || (ev->exit_code == 255)))
{
if (e_config->exec.show_run_dialog)
{
E_Dialog *dia;
@ -368,8 +370,11 @@ _e_exec_cb_exit(void *data, int type, void *event)
e_dialog_show(dia);
}
}
}
/* Let's hope that everything returns this properly. */
else if (!((ev->exited) && (ev->exit_code == EXIT_SUCCESS)))
{
if (e_config->exec.show_exit_dialog)
{
/* filter out common exits via signals - int/term/quit. not really
* worth popping up a dialog for */
@ -385,12 +390,13 @@ _e_exec_cb_exit(void *data, int type, void *event)
ecore_exe_event_data_get(ev->exe, ECORE_EXE_PIPE_READ));
}
}
}
/* maybe better 1 minute? it might be openoffice */
if (ecore_time_get() - inst->launch_time < 5.0)
if (ecore_time_get() - inst->launch_time < 2.0)
{
if (inst->expire_timer) ecore_timer_del(inst->expire_timer);
inst->expire_timer = ecore_timer_add(30.0, _e_exec_cb_instance_finish, inst);
inst->expire_timer = ecore_timer_add(e_config->exec.expire_timeout, _e_exec_cb_instance_finish, inst);
}
else
_e_exec_instance_free(inst);