Merge branch 'terminology-1.3'

This commit is contained in:
Boris Faure 2018-12-16 14:30:12 +01:00
commit 852785332e
7 changed files with 23 additions and 27 deletions

View File

@ -1,3 +1,11 @@
2018-12-16
* Release v1.3.1
* Add manpages on Terminology's helpers
* Do not popup unknown media types (security issue)
* Right-click on hyperlinks no longer crashes
2018-11-23
* Release v1.3.0

13
NEWS
View File

@ -1,7 +1,18 @@
=================
Terminology 1.3.0
Terminology 1.3.1
=================
Changes since 1.3.0:
--------------------
Addition:
* Add manpages on Terminology's helpers
Fixes:
* Do not popup unknown media types (security issue)
* Right-click on hyperlinks no longer crashes
Changes since 1.2.1:
--------------------

View File

@ -1,4 +1,4 @@
Terminology 1.2.1
Terminology 1.3.1
=================
This is an EFL terminal emulator with some extra bells and whistles.

View File

@ -1,5 +1,5 @@
.\" Manpage for Terminology
.TH TERMINOLOGY 1 "23 Nov 2018" "1.3.0" "Terminology man page"
.TH TERMINOLOGY 1 "16 Dec 2018" "1.3.1" "Terminology man page"
.SH NAME
Terminology \- Terminal Emulator written with EFL (Enlightenment Foundation Libraries).
.SH SYNOPSIS

View File

@ -1531,22 +1531,3 @@ media_control_get(const Evas_Object *obj)
if (!sd) return NULL;
return sd->o_ctrl;
}
void
media_unknown_handle(const char *handler, const char *src)
{
const char *cmd;
char buf[PATH_MAX];
char *escaped;
cmd = "xdg-open";
escaped = ecore_file_escape_name(src);
if (!escaped)
return;
if (handler && *handler)
cmd = handler;
snprintf(buf, sizeof(buf), "%s %s", cmd, escaped);
free(escaped);
ecore_exe_run(buf, NULL);
}

View File

@ -38,6 +38,5 @@ void media_stop(Evas_Object *obj);
const char *media_get(const Evas_Object *obj);
Media_Type media_src_type_get(const char *src);
Evas_Object *media_control_get(const Evas_Object *obj);
void media_unknown_handle(const char *handler, const char *src);
#endif

View File

@ -4082,7 +4082,7 @@ static Eina_Bool
_media_http_head_timeout(void *data)
{
Ty_Http_Head *ty_head = data;
media_unknown_handle(ty_head->handler, ty_head->src);
ty_head->timeout = NULL;
_ty_http_head_delete(ty_head);
return ECORE_CALLBACK_CANCEL;
@ -4151,7 +4151,6 @@ _media_http_head_complete(void *data,
_ty_http_head_delete(ty_head);
return EINA_TRUE;
error:
media_unknown_handle(ty_head->handler, ty_head->src);
_ty_http_head_delete(ty_head);
return EINA_TRUE;
}
@ -4192,8 +4191,6 @@ _popmedia(Term *term, const char *src)
error:
_ty_http_head_delete(ty_head);
#endif
media_unknown_handle(config->helper.local.general, src);
}
else
{