forked from enlightenment/enlightenment
add e_util_open(), unify all callers of enlightenment_open
ref adbba1042b
This commit is contained in:
parent
bb53d4606f
commit
90fcc55f1e
|
@ -1441,3 +1441,20 @@ e_util_memclear(void *s, size_t n)
|
||||||
{
|
{
|
||||||
memset_ptr(s, 0, n);
|
memset_ptr(s, 0, n);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
E_API Ecore_Exe *
|
||||||
|
e_util_open(const char *exe, void *data)
|
||||||
|
{
|
||||||
|
char *sb;
|
||||||
|
size_t size = 65536, len;
|
||||||
|
Ecore_Exe *ret;
|
||||||
|
|
||||||
|
sb = malloc(size);
|
||||||
|
snprintf(sb, size, "%s/enlightenment_open ", e_prefix_bin_get());
|
||||||
|
len = strlen(sb);
|
||||||
|
sb = e_util_string_append_quoted(sb, &size, &len, exe);
|
||||||
|
ret = ecore_exe_run(sb, data);
|
||||||
|
free(sb);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
|
@ -65,6 +65,8 @@ E_API void e_util_string_list_free(Eina_List *l);
|
||||||
|
|
||||||
E_API void e_util_memclear(void *s, size_t n);
|
E_API void e_util_memclear(void *s, size_t n);
|
||||||
|
|
||||||
|
E_API Ecore_Exe *e_util_open(const char *exe, void *data);
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
e_util_pointer_center(const E_Client *ec)
|
e_util_pointer_center(const E_Client *ec)
|
||||||
{
|
{
|
||||||
|
|
|
@ -519,15 +519,8 @@ tw_link_hide(E_Client *ec, const char *uri)
|
||||||
EINTERN void
|
EINTERN void
|
||||||
tw_link_open(E_Client *ec, const char *uri)
|
tw_link_open(E_Client *ec, const char *uri)
|
||||||
{
|
{
|
||||||
char *sb;
|
if (ec->focused)
|
||||||
size_t size = 4096, len = sizeof(E_BINDIR "/enlightenment_open ") - 1;
|
e_util_open(uri, NULL);
|
||||||
|
|
||||||
if (!ec->focused) return;
|
|
||||||
sb = malloc(size);
|
|
||||||
memcpy(sb, E_BINDIR "/enlightenment_open ", len);
|
|
||||||
sb = e_util_string_append_quoted(sb, &size, &len, uri);
|
|
||||||
ecore_exe_run(sb, NULL);
|
|
||||||
free(sb);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Eet_Data_Descriptor *
|
static Eet_Data_Descriptor *
|
||||||
|
|
|
@ -14,15 +14,7 @@ struct _E_Widget_Smart_Data
|
||||||
static void
|
static void
|
||||||
_open_browser_help_cb(void *data EINA_UNUSED, void *obj EINA_UNUSED)
|
_open_browser_help_cb(void *data EINA_UNUSED, void *obj EINA_UNUSED)
|
||||||
{
|
{
|
||||||
const char *url = "https://phab.enlightenment.org/w/emodules/tiling2/";
|
e_util_open("https://phab.enlightenment.org/w/emodules/tiling2/", NULL);
|
||||||
char *sb;
|
|
||||||
size_t size = 4096, len = sizeof(E_BINDIR "/enlightenment_open ") - 1;
|
|
||||||
|
|
||||||
sb = malloc(size);
|
|
||||||
memcpy(sb, E_BINDIR "/enlightenment_open ", len);
|
|
||||||
sb = e_util_string_append_quoted(sb, &size, &len, url);
|
|
||||||
ecore_exe_run(sb, NULL);
|
|
||||||
free(sb);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Some defines to make coding with the e_widget_* easier for configuration
|
/* Some defines to make coding with the e_widget_* easier for configuration
|
||||||
|
|
|
@ -1442,18 +1442,10 @@ _wireless_auth_external_deny(void *data, Evas_Object *obj EINA_UNUSED, void *eve
|
||||||
static void
|
static void
|
||||||
_wireless_auth_external_allow(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
|
_wireless_auth_external_allow(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
|
||||||
{
|
{
|
||||||
char *sb, *uri = data;
|
char *uri = data;
|
||||||
const char *bindir;
|
|
||||||
size_t size = PATH_MAX, len;
|
|
||||||
|
|
||||||
bindir = e_prefix_bin_get();
|
e_util_open(uri, NULL);
|
||||||
len = strlen(bindir);
|
DBG("launched uri: %s", uri);
|
||||||
sb = malloc(size);
|
|
||||||
snprintf(sb, size, "%s/enlightenment_open", bindir);
|
|
||||||
sb = e_util_string_append_quoted(sb, &size, &len, uri);
|
|
||||||
DBG("launched command: %s", sb);
|
|
||||||
ecore_exe_run(sb, NULL);
|
|
||||||
free(sb);
|
|
||||||
free(uri);
|
free(uri);
|
||||||
auth_popup = 0;
|
auth_popup = 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue