This is an automated email from the git hooks/post-receive script.
git pushed a commit to reference refs/pull/116/head
in repository enlightenment.
View the commit online.
commit ce5848da8c6eb3c87af6e250abd3944ae0586ec8
Author: Swagtoy <m...@ow.swag.toys>
AuthorDate: Wed Jun 25 23:17:29 2025 -0400
Use global exe_always_single_instance instead of Ibar setting; e_exec force launch argument
As per Raster's request, it will now use the global setting. Per a discussion over IRC, only Everything and Ibar should use the e_exec force launch argument.
This might break some 3rd party plugins due to adding an argument to e_exec.
---
src/bin/e_actions.c | 6 ++---
src/bin/e_configure.c | 2 +-
src/bin/e_desklock.c | 2 +-
src/bin/e_exec.c | 8 +++----
src/bin/e_exec.h | 2 +-
src/bin/e_int_menus.c | 2 +-
src/bin/e_startup.c | 4 ++--
src/modules/conf_theme/e_int_config_theme.c | 2 +-
src/modules/conf_theme/e_int_config_wallpaper.c | 2 +-
src/modules/conf_theme/e_mod_main.c | 2 +-
src/modules/connman/e_mod_main.c | 2 +-
src/modules/everything/evry_plug_apps.c | 2 +-
src/modules/everything/evry_util.c | 10 ++++----
src/modules/fileman/e_fwin.c | 32 ++++++++++++-------------
src/modules/fileman/e_mod_dbus.c | 8 +++----
src/modules/fileman/e_mod_menu.c | 2 +-
src/modules/ibar/e_mod_config.c | 5 ----
src/modules/ibar/e_mod_main.c | 25 ++++++++++---------
src/modules/music-control/e_mod_main.c | 4 ++--
src/modules/packagekit/e_mod_packagekit.c | 2 +-
src/modules/quickaccess/e_mod_quickaccess.c | 2 +-
21 files changed, 60 insertions(+), 66 deletions(-)
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index 3b542ad60..6e38af371 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -2110,7 +2110,7 @@ ACT_FN_GO(exec, )
if (zone)
{
if (params)
- e_exec(zone, NULL, params, NULL, "action/exec");
+ e_exec(zone, NULL, params, NULL, "action/exec", EINA_FALSE);
}
}
@@ -2169,7 +2169,7 @@ ACT_FN_GO(app, )
desktop = efreet_util_desktop_exec_find(p);
if (desktop)
{
- e_exec(zone, desktop, NULL, NULL, "action/app");
+ e_exec(zone, desktop, NULL, NULL, "action/app", EINA_FALSE);
efreet_desktop_free(desktop);
}
}
@@ -2197,7 +2197,7 @@ ACT_FN_GO(app_new_instance, EINA_UNUSED)
ec = (E_Client *)(void *)obj;
if (ec->desktop)
- e_exec(zone, ec->desktop, NULL, NULL, "action/app");
+ e_exec(zone, ec->desktop, NULL, NULL, "action/app", EINA_FALSE);
}
/***************************************************************************/
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index ab598972c..06fd451c7 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -79,7 +79,7 @@ e_configure_registry_call(const char *path, Evas_Object *parent, const char *par
params, eci->desktop);
else
e_exec(e_zone_current_get(),
- eci->desktop, NULL, NULL, "config");
+ eci->desktop, NULL, NULL, "config", EINA_FALSE);
}
break;
}
diff --git a/src/bin/e_desklock.c b/src/bin/e_desklock.c
index a80854559..70285cd68 100644
--- a/src/bin/e_desklock.c
+++ b/src/bin/e_desklock.c
@@ -502,7 +502,7 @@ _e_desklock_run(E_Desklock_Run *task)
return EINA_FALSE;
}
- e_exec(NULL, desktop, NULL, NULL, NULL);
+ e_exec(NULL, desktop, NULL, NULL, NULL, EINA_FALSE);
return EINA_TRUE;
}
diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c
index a31d41378..cd251be24 100644
--- a/src/bin/e_exec.c
+++ b/src/bin/e_exec.c
@@ -274,7 +274,7 @@ e_exec_recent_files_get(void)
E_API E_Exec_Instance *
e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
- Eina_List *files, const char *launch_method)
+ Eina_List *files, const char *launch_method, Eina_Bool force_launch)
{
E_Exec_Launch *launch;
E_Exec_Instance *inst = NULL;
@@ -312,13 +312,13 @@ e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec,
const char *single;
single = eina_hash_find(desktop->x, "X-Enlightenment-Single-Instance");
- if ((single) ||
- (e_config->exe_always_single_instance))
+ if (((single) ||
+ (e_config->exe_always_single_instance)) && !force_launch)
{
Eina_Bool dosingle = EINA_FALSE;
// first take system config for always single instance if set
- if (e_config->exe_always_single_instance) dosingle = EINA_TRUE;
+ if (e_config->exe_always_single_instance && !force_launch) dosingle = EINA_TRUE;
// and now let desktop file override it
if (single)
diff --git a/src/bin/e_exec.h b/src/bin/e_exec.h
index 905216f20..1c9a513d4 100644
--- a/src/bin/e_exec.h
+++ b/src/bin/e_exec.h
@@ -41,7 +41,7 @@ typedef enum
EINTERN int e_exec_init(void);
EINTERN int e_exec_shutdown(void);
E_API void e_exec_executor_set(E_Exec_Instance *(*func) (void *data, E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method), const void *data);
-E_API E_Exec_Instance *e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method);
+E_API E_Exec_Instance *e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char *launch_method, Eina_Bool force_launch);
E_API E_Exec_Instance *e_exec_phony(E_Client *ec);
E_API Eina_Bool e_exec_phony_del(E_Exec_Instance *inst);
E_API E_Exec_Instance *e_exec_startup_id_pid_instance_find(int id, pid_t pid);
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 2f67ecb2f..69a552adc 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -1150,7 +1150,7 @@ _e_int_menus_apps_run(void *data, E_Menu *m, E_Menu_Item *mi EINA_UNUSED)
Efreet_Desktop *desktop;
desktop = data;
- e_exec(m->zone, desktop, NULL, NULL, "menu/apps");
+ e_exec(m->zone, desktop, NULL, NULL, "menu/apps", EINA_FALSE);
}
/*
diff --git a/src/bin/e_startup.c b/src/bin/e_startup.c
index e1d44177c..082665942 100644
--- a/src/bin/e_startup.c
+++ b/src/bin/e_startup.c
@@ -49,7 +49,7 @@ static Eina_Bool
_e_startup_delay(void *data)
{
Efreet_Desktop *desktop = data;
- e_exec(NULL, desktop, NULL, NULL, NULL);
+ e_exec(NULL, desktop, NULL, NULL, NULL, EINA_FALSE);
efreet_desktop_unref(desktop);
return EINA_FALSE;
}
@@ -86,7 +86,7 @@ _e_startup(void)
efreet_desktop_ref(desktop);
ecore_timer_add(delay, _e_startup_delay, desktop);
}
- else e_exec(NULL, desktop, NULL, NULL, NULL);
+ else e_exec(NULL, desktop, NULL, NULL, NULL, EINA_FALSE);
ecore_job_add(_e_startup_next_cb, NULL);
}
diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c
index b90210ed6..3eaed22b9 100644
--- a/src/modules/conf_theme/e_int_config_theme.c
+++ b/src/modules/conf_theme/e_int_config_theme.c
@@ -535,7 +535,7 @@ _cb_import_online(void *data1 EINA_UNUSED, void *data2 EINA_UNUSED)
zone = e_zone_current_get();
- e_exec(zone, desktop, NULL, NULL, "extra/app");
+ e_exec(zone, desktop, NULL, NULL, "extra/app", EINA_FALSE);
efreet_desktop_free(desktop);
}
diff --git a/src/modules/conf_theme/e_int_config_wallpaper.c b/src/modules/conf_theme/e_int_config_wallpaper.c
index b80fc4d36..9a129207b 100644
--- a/src/modules/conf_theme/e_int_config_wallpaper.c
+++ b/src/modules/conf_theme/e_int_config_wallpaper.c
@@ -338,7 +338,7 @@ _cb_import_online(void *data1 EINA_UNUSED, void *data2 EINA_UNUSED)
zone = e_zone_current_get();
- e_exec(zone, desktop, NULL, NULL, "extra/app");
+ e_exec(zone, desktop, NULL, NULL, "extra/app", EINA_FALSE);
efreet_desktop_free(desktop);
}
diff --git a/src/modules/conf_theme/e_mod_main.c b/src/modules/conf_theme/e_mod_main.c
index 47b33e4e9..dbbdbed40 100644
--- a/src/modules/conf_theme/e_mod_main.c
+++ b/src/modules/conf_theme/e_mod_main.c
@@ -73,7 +73,7 @@ e_int_config_colors(Evas_Object *parent EINA_UNUSED, const char *params EINA_UNU
if (desktop)
{
e_exec(e_zone_current_get(), desktop,
- "enlightenment_paledit", NULL, "conf_theme");
+ "enlightenment_paledit", NULL, "conf_theme", EINA_FALSE);
efreet_desktop_free(desktop);
}
return NULL;
diff --git a/src/modules/connman/e_mod_main.c b/src/modules/connman/e_mod_main.c
index 4f700363e..ab1a50586 100644
--- a/src/modules/connman/e_mod_main.c
+++ b/src/modules/connman/e_mod_main.c
@@ -198,7 +198,7 @@ _econnman_app_launch(E_Connman_Instance *inst)
if (!zone)
zone = e_zone_current_get();
- e_exec(zone, desktop, NULL, NULL, "econnman/app");
+ e_exec(zone, desktop, NULL, NULL, "econnman/app", EINA_FALSE);
efreet_desktop_free(desktop);
}
diff --git a/src/modules/everything/evry_plug_apps.c b/src/modules/everything/evry_plug_apps.c
index 3b7681d16..c1693d37c 100644
--- a/src/modules/everything/evry_plug_apps.c
+++ b/src/modules/everything/evry_plug_apps.c
@@ -1072,7 +1072,7 @@ _run_executable(Evry_Action *act)
{
GET_FILE(file, act->it1.item);
- e_exec(e_zone_current_get(), NULL, file->path, NULL, NULL);
+ e_exec(e_zone_current_get(), NULL, file->path, NULL, NULL, EINA_TRUE);
return 1;
}
diff --git a/src/modules/everything/evry_util.c b/src/modules/everything/evry_util.c
index 128e9819a..e33b55a44 100644
--- a/src/modules/everything/evry_util.c
+++ b/src/modules/everything/evry_util.c
@@ -639,7 +639,7 @@ evry_util_exec_app(const Evry_Item *it_app, const Evry_Item *it_file)
files = eina_list_append(files, file->path);
}
- e_exec(zone, app->desktop, NULL, files, NULL);
+ e_exec(zone, app->desktop, NULL, files, NULL, EINA_FALSE);
if (file && file->mime && !open_folder)
e_exehist_mime_desktop_add(file->mime, app->desktop);
@@ -652,12 +652,12 @@ evry_util_exec_app(const Evry_Item *it_app, const Evry_Item *it_file)
else if (app->file)
{
files = eina_list_append(files, app->file);
- e_exec(zone, app->desktop, NULL, files, NULL);
+ e_exec(zone, app->desktop, NULL, files, NULL, EINA_FALSE);
eina_list_free(files);
}
else
{
- e_exec(zone, app->desktop, NULL, NULL, NULL);
+ e_exec(zone, app->desktop, NULL, NULL, NULL, EINA_FALSE);
}
}
else if (app->file)
@@ -668,13 +668,13 @@ evry_util_exec_app(const Evry_Item *it_app, const Evry_Item *it_file)
len = strlen(app->file) + strlen(file->path) + 4;
exe = malloc(len);
snprintf(exe, len, "%s \'%s\'", app->file, file->path);
- e_exec(zone, NULL, exe, NULL, NULL);
+ e_exec(zone, NULL, exe, NULL, NULL, EINA_FALSE);
E_FREE(exe);
}
else
{
exe = (char *)app->file;
- e_exec(zone, NULL, exe, NULL, NULL);
+ e_exec(zone, NULL, exe, NULL, NULL, EINA_FALSE);
}
}
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index e5619c2a0..8e4643e51 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -306,7 +306,7 @@ _e_fwin_cb_dir_mime_handler(void *data, Evas_Object *obj, const char *path)
}
}
- e_exec(e_zone_current_get(), h->desktop, NULL, files, "fileman");
+ e_exec(e_zone_current_get(), h->desktop, NULL, files, "fileman", EINA_FALSE);
EINA_LIST_FREE(files, f) eina_stringshare_del(f);
}
@@ -1564,13 +1564,13 @@ _e_fwin_desktop_run(Efreet_Desktop *desktop,
}
if ((fwin->win) && (desktop))
{
- e_exec(e_comp_object_util_zone_get(fwin->win), desktop, NULL, files, "fwin");
+ e_exec(e_comp_object_util_zone_get(fwin->win), desktop, NULL, files, "fwin", EINA_FALSE);
ici = selected->data;
if ((ici) && (ici->mime) && (desktop) && !(skip_history))
e_exehist_mime_desktop_add(ici->mime, desktop);
}
else if (fwin->zone && desktop)
- e_exec(fwin->zone, desktop, NULL, files, "fwin");
+ e_exec(fwin->zone, desktop, NULL, files, "fwin", EINA_FALSE);
eina_list_free(selected);
@@ -1667,36 +1667,36 @@ _e_fwin_file_exec(E_Fwin_Page *page,
snprintf(buf, sizeof(buf), "%s/%s", e_fm2_real_path_get(fwin->cur_page->fm_obj), ici->file);
// XXX: exec verify buf
if (fwin->win)
- e_exec(e_comp_object_util_zone_get(fwin->win), NULL, buf, NULL, "fwin");
+ e_exec(e_comp_object_util_zone_get(fwin->win), NULL, buf, NULL, "fwin", EINA_FALSE);
else if (fwin->zone)
- e_exec(fwin->zone, NULL, buf, NULL, "fwin");
+ e_exec(fwin->zone, NULL, buf, NULL, "fwin", EINA_FALSE);
break;
case E_FWIN_EXEC_SH:
snprintf(buf, sizeof(buf), "/bin/sh %s", e_util_filename_escape(ici->file));
// XXX: exec verify buf
if (fwin->win)
- e_exec(e_comp_object_util_zone_get(fwin->win), NULL, buf, NULL, "fwin");
+ e_exec(e_comp_object_util_zone_get(fwin->win), NULL, buf, NULL, "fwin", EINA_FALSE);
else if (fwin->zone)
- e_exec(fwin->zone, NULL, buf, NULL, "fwin");
+ e_exec(fwin->zone, NULL, buf, NULL, "fwin", EINA_FALSE);
break;
case E_FWIN_EXEC_TERMINAL_DIRECT:
snprintf(buf, sizeof(buf), "%s %s", e_config->exebuf_term_cmd, e_util_filename_escape(ici->file));
// XXX: exec verify buf
if (fwin->win)
- e_exec(e_comp_object_util_zone_get(fwin->win), NULL, buf, NULL, "fwin");
+ e_exec(e_comp_object_util_zone_get(fwin->win), NULL, buf, NULL, "fwin", EINA_FALSE);
else if (fwin->zone)
- e_exec(fwin->zone, NULL, buf, NULL, "fwin");
+ e_exec(fwin->zone, NULL, buf, NULL, "fwin", EINA_FALSE);
break;
case E_FWIN_EXEC_TERMINAL_SH:
snprintf(buf, sizeof(buf), "%s /bin/sh %s", e_config->exebuf_term_cmd, e_util_filename_escape(ici->file));
// XXX: exec verify buf
if (fwin->win)
- e_exec(e_comp_object_util_zone_get(fwin->win), NULL, buf, NULL, "fwin");
+ e_exec(e_comp_object_util_zone_get(fwin->win), NULL, buf, NULL, "fwin", EINA_FALSE);
else if (fwin->zone)
- e_exec(fwin->zone, NULL, buf, NULL, "fwin");
+ e_exec(fwin->zone, NULL, buf, NULL, "fwin", EINA_FALSE);
break;
case E_FWIN_EXEC_DESKTOP:
@@ -1706,9 +1706,9 @@ _e_fwin_file_exec(E_Fwin_Page *page,
if (desktop)
{
if (fwin->win)
- e_exec(e_comp_object_util_zone_get(fwin->win), desktop, NULL, NULL, "fwin");
+ e_exec(e_comp_object_util_zone_get(fwin->win), desktop, NULL, NULL, "fwin", EINA_FALSE);
else if (fwin->zone)
- e_exec(fwin->zone, desktop, NULL, NULL, "fwin");
+ e_exec(fwin->zone, desktop, NULL, NULL, "fwin", EINA_FALSE);
efreet_desktop_free(desktop);
}
break;
@@ -2245,7 +2245,7 @@ _e_fwin_cb_dir_handler(void *data EINA_UNUSED, Evas_Object *obj, const char *pat
if (rp && (rp != path) && (evas_object_data_del(obj, "fileman_terminal_realpath"))) //icon menu; use rp
path = rp;
if (chdir(path) < 0) perror("chdir");
- e_exec(e_zone_current_get(), tdesktop, NULL, NULL, "fileman");
+ e_exec(e_zone_current_get(), tdesktop, NULL, NULL, "fileman", EINA_FALSE);
if (chdir(buf) < 0) perror("chdir");
/* FIXME: if info != null then check mime type and offer options based
* on that
@@ -2751,12 +2751,12 @@ _e_fwin_file_open_dialog(E_Fwin_Page *page,
{
if (fwin->win)
{
- if (e_exec(e_comp_object_util_zone_get(fwin->win), desk, NULL, files_list, "fwin"))
+ if (e_exec(e_comp_object_util_zone_get(fwin->win), desk, NULL, files_list, "fwin", EINA_FALSE))
need_dia = 0;
}
else if (fwin->zone)
{
- if (e_exec(fwin->zone, desk, NULL, files_list, "fwin"))
+ if (e_exec(fwin->zone, desk, NULL, files_list, "fwin", EINA_FALSE))
need_dia = 0;
}
if (!need_dia)
diff --git a/src/modules/fileman/e_mod_dbus.c b/src/modules/fileman/e_mod_dbus.c
index c571bef20..a4e373d8e 100644
--- a/src/modules/fileman/e_mod_dbus.c
+++ b/src/modules/fileman/e_mod_dbus.c
@@ -245,7 +245,7 @@ _e_fileman_dbus_daemon_open_file_cb(const Eldbus_Service_Interface *iface EINA_U
goto error;
}
// XXX: exec verify real_file
- e_exec(zone, desktop, NULL, NULL, NULL);
+ e_exec(zone, desktop, NULL, NULL, NULL, EINA_FALSE);
efreet_desktop_free(desktop);
goto end;
}
@@ -253,7 +253,7 @@ _e_fileman_dbus_daemon_open_file_cb(const Eldbus_Service_Interface *iface EINA_U
ecore_file_can_exec(param_file))
{
// XXX: exec verify param_file
- e_exec(zone, NULL, param_file, NULL, NULL);
+ e_exec(zone, NULL, param_file, NULL, NULL, EINA_FALSE);
goto end;
}
else if (_mime_shell_script_check(mime))
@@ -272,7 +272,7 @@ _e_fileman_dbus_daemon_open_file_cb(const Eldbus_Service_Interface *iface EINA_U
e_config->exebuf_term_cmd,
shell,
param_file);
- e_exec(zone, NULL, eina_strbuf_string_get(b), NULL, NULL);
+ e_exec(zone, NULL, eina_strbuf_string_get(b), NULL, NULL, EINA_FALSE);
eina_strbuf_free(b);
goto end;
}
@@ -288,7 +288,7 @@ _e_fileman_dbus_daemon_open_file_cb(const Eldbus_Service_Interface *iface EINA_U
Efreet_Desktop *desktop = handlers->data;
Eina_List *files = eina_list_append(NULL, param_file);
- e_exec(zone, desktop, NULL, files, NULL);
+ e_exec(zone, desktop, NULL, files, NULL, EINA_FALSE);
eina_list_free(files);
EINA_LIST_FREE(handlers, desktop)
diff --git a/src/modules/fileman/e_mod_menu.c b/src/modules/fileman/e_mod_menu.c
index 977aad5d8..3f0f16b4e 100644
--- a/src/modules/fileman/e_mod_menu.c
+++ b/src/modules/fileman/e_mod_menu.c
@@ -431,7 +431,7 @@ _e_mod_menu_recent_cb(void *data EINA_UNUSED,
Eina_List *files = NULL;
files = eina_list_append(files, file);
- e_exec(m->zone, desktop, NULL, files, "fwin");
+ e_exec(m->zone, desktop, NULL, files, "fwin", EINA_FALSE);
files = eina_list_free(files);
}
EINA_LIST_FREE(handlers, desktop)
diff --git a/src/modules/ibar/e_mod_config.c b/src/modules/ibar/e_mod_config.c
index b384af0ac..d8c4c5a5b 100644
--- a/src/modules/ibar/e_mod_config.c
+++ b/src/modules/ibar/e_mod_config.c
@@ -9,7 +9,6 @@ struct _E_Config_Dialog_Data
int track_launch;
int dont_add_nonorder;
int icon_menu_mouseover;
- int activate_click;
Evas_Object *tlist;
Evas_Object *radio_name;
@@ -72,7 +71,6 @@ _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata)
cfdata->lock_move = ci->lock_move;
cfdata->dont_add_nonorder = ci->dont_add_nonorder;
cfdata->track_launch = !ci->dont_track_launch;
- cfdata->activate_click = ci->activate_click;
cfdata->icon_menu_mouseover = !ci->dont_icon_menu_mouseover;
}
@@ -150,8 +148,6 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
of = e_widget_framelist_add(evas, _("Misc"), 0);
ob = e_widget_check_add(evas, _("Lock icon move"), &(cfdata->lock_move));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Activate window on click"), &(cfdata->activate_click));
- e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Don't show active windows"), &(cfdata->dont_add_nonorder));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Track launch"), &(cfdata->track_launch));
@@ -178,7 +174,6 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
ci->lock_move = cfdata->lock_move;
ci->dont_add_nonorder = cfdata->dont_add_nonorder;
ci->dont_track_launch = !cfdata->track_launch;
- ci->activate_click = cfdata->activate_click;
ci->dont_icon_menu_mouseover = !cfdata->icon_menu_mouseover;
_ibar_config_update(ci);
e_config_save_queue();
diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 955b877bd..44dfbf2df 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -1031,7 +1031,7 @@ static void
_ibar_cb_menu_icon_action_exec(void *data, E_Menu *m EINA_UNUSED, E_Menu_Item *mi EINA_UNUSED)
{
Efreet_Desktop_Action *action = ""
- e_exec(NULL, NULL, action->exec, NULL, "ibar");
+ e_exec(NULL, NULL, action->exec, NULL, "ibar", EINA_FALSE);
}
static void
@@ -1584,7 +1584,7 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
ev = event_info;
ic = data;
- if (ev->button == 1 || (ic->ibar->inst->ci->activate_click && ev->button == 2))
+ if (ev->button == 1 || (e_config->exe_always_single_instance && ev->button == 2))
{
ic->drag.x = ev->output.x;
ic->drag.y = ev->output.y;
@@ -1694,8 +1694,8 @@ _ibar_cb_icon_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
mi);
e_menu_item_callback_set(mi, _ibar_cb_menu_client_show, client);
e_menu_item_submenu_set(mi, client->border_menu);
+ client->border_menu = NULL;
}
- //client->border_menu = NULL;
}
@@ -1848,7 +1848,7 @@ _ibar_instance_watch(void *data, E_Exec_Instance *inst, E_Exec_Watch_Type type)
static void
_ibar_icon_go(IBar_Icon *ic, Eina_Bool keep_going, Eina_Bool force_open)
{
- if ((ic->not_in_order || ic->ibar->inst->ci->activate_click) && !force_open)
+ if ((ic->not_in_order || e_config->exe_always_single_instance) && !force_open)
{
Eina_List *l, *ll;
E_Exec_Instance *exe;
@@ -1862,7 +1862,7 @@ _ibar_icon_go(IBar_Icon *ic, Eina_Bool keep_going, Eina_Bool force_open)
count++;
if (count > 1)
{
- if (ic->ibar->inst->ci->activate_click)
+ if (e_config->exe_always_single_instance)
{
E_Client *client = _ibar_next_client(ic, 1);
if (client)
@@ -1882,20 +1882,20 @@ _ibar_icon_go(IBar_Icon *ic, Eina_Bool keep_going, Eina_Bool force_open)
else
e_client_activate(eclast, 1);
}
- if (!ic->ibar->inst->ci->activate_click || eclast)
+ if (!e_config->exe_always_single_instance || eclast)
return;
}
if (ic->app->type == EFREET_DESKTOP_TYPE_APPLICATION)
{
if (ic->ibar->inst->ci->dont_track_launch)
e_exec(ic->ibar->inst->gcc->gadcon->zone,
- ic->app, NULL, NULL, "ibar");
+ ic->app, NULL, NULL, "ibar", EINA_TRUE);
else
{
E_Exec_Instance *einst;
einst = e_exec(ic->ibar->inst->gcc->gadcon->zone,
- ic->app, NULL, NULL, "ibar");
+ ic->app, NULL, NULL, "ibar", EINA_TRUE);
if (einst)
{
ic->exe_inst = einst;
@@ -1925,16 +1925,16 @@ _ibar_cb_icon_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UN
{
Evas_Event_Mouse_Up *ev;
IBar_Icon *ic;
- Eina_Bool activate_click_launch;
+ Eina_Bool single_inst_launch;
ev = event_info;
ic = data;
- activate_click_launch = (ic->ibar->inst->ci->activate_click && ev->button == 2);
+ single_inst_launch = (e_config->exe_always_single_instance && ev->button == 2);
- if ((ev->button == 1 || activate_click_launch) && (ic->mouse_down == 1))
+ if ((ev->button == 1 || single_inst_launch) && (ic->mouse_down == 1))
{
- if (!ic->drag.dnd) _ibar_icon_go(ic, EINA_FALSE, activate_click_launch);
+ if (!ic->drag.dnd) _ibar_icon_go(ic, EINA_FALSE, single_inst_launch);
ic->drag.start = 0;
ic->drag.dnd = 0;
ic->mouse_down = 0;
@@ -2949,7 +2949,6 @@ e_modapi_init(E_Module *m)
E_CONFIG_VAL(D, T, lock_move, INT);
E_CONFIG_VAL(D, T, dont_add_nonorder, INT);
E_CONFIG_VAL(D, T, dont_track_launch, UCHAR);
- E_CONFIG_VAL(D, T, activate_click, UCHAR);
E_CONFIG_VAL(D, T, dont_icon_menu_mouseover, UCHAR);
conf_edd = E_CONFIG_DD_NEW("IBar_Config", Config);
diff --git a/src/modules/music-control/e_mod_main.c b/src/modules/music-control/e_mod_main.c
index 997475c85..c4da9c466 100644
--- a/src/modules/music-control/e_mod_main.c
+++ b/src/modules/music-control/e_mod_main.c
@@ -553,7 +553,7 @@ music_control_launch(E_Music_Control_Instance *inst)
{
E_Zone *zone = e_gadcon_zone_get(inst->gcc->gadcon);
e_exec(zone, desktop, NULL/* command */,
- NULL/* file list */, "module/music-control");
+ NULL/* file list */, "module/music-control", EINA_FALSE);
ctxt->config->player_selected = i;
music_control_dbus_init
(ctxt, music_player_players[i].dbus_name);
@@ -566,7 +566,7 @@ music_control_launch(E_Music_Control_Instance *inst)
E_Zone *zone = e_gadcon_zone_get(inst->gcc->gadcon);
e_exec(zone, NULL/* efreet desktop*/,
music_player_players[ctxt->config->player_selected].command,
- NULL/* file list */, "module/music-control");
+ NULL/* file list */, "module/music-control", EINA_FALSE);
}
}
diff --git a/src/modules/packagekit/e_mod_packagekit.c b/src/modules/packagekit/e_mod_packagekit.c
index 22e34c457..87e34da37 100644
--- a/src/modules/packagekit/e_mod_packagekit.c
+++ b/src/modules/packagekit/e_mod_packagekit.c
@@ -213,7 +213,7 @@ _run_button_cb(void *data, Evas_Object *obj EINA_UNUSED,
e_exec(e_zone_current_get(), NULL,
inst->ctxt->config->manager_command,
- NULL, NULL);
+ NULL, NULL, EINA_FALSE);
}
void
diff --git a/src/modules/quickaccess/e_mod_quickaccess.c b/src/modules/quickaccess/e_mod_quickaccess.c
index c053bc572..80e365a9b 100644
--- a/src/modules/quickaccess/e_mod_quickaccess.c
+++ b/src/modules/quickaccess/e_mod_quickaccess.c
@@ -460,7 +460,7 @@ _e_qa_border_new(E_Quick_Access_Entry *entry)
INF("start quick access '%s' (name=%s, class=%s), "
"run command '%s'", entry->id, entry->name, entry->class, entry->cmd);
- ei = e_exec(NULL, NULL, entry->cmd, NULL, NULL);
+ ei = e_exec(NULL, NULL, entry->cmd, NULL, NULL, EINA_FALSE);
if ((!ei) || (!ei->exe))
{
ERR("could not execute '%s'", entry->cmd);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
