aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2018-12-16 14:30:12 +0100
committerBoris Faure <billiob@gmail.com>2018-12-16 14:30:12 +0100
commit852785332e7712852b939d8f0065062d988e79ac (patch)
tree37a5da2fc505f35d58c1c8ca548490b37f52fd80
parentMerge branch 'terminology-1.3' (diff)
parentTerminology release 1.3.1 (diff)
downloadterminology-master.tar.gz
Merge branch 'terminology-1.3'HEADmaster
-rw-r--r--ChangeLog8
-rw-r--r--NEWS13
-rw-r--r--README.md2
-rw-r--r--man/terminology.12
-rw-r--r--src/bin/media.c19
-rw-r--r--src/bin/media.h1
-rw-r--r--src/bin/win.c5
7 files changed, 23 insertions, 27 deletions
diff --git a/ChangeLog b/ChangeLog
index 07182b2..a56f5ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/NEWS b/NEWS
index 07c0f8a..39b7a19 100644
--- a/NEWS
+++ b/NEWS
@@ -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:
--------------------
diff --git a/README.md b/README.md
index 1733d09..c924654 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Terminology 1.2.1
+Terminology 1.3.1
=================
This is an EFL terminal emulator with some extra bells and whistles.
diff --git a/man/terminology.1 b/man/terminology.1
index 9e025da..7dc4772 100644
--- a/man/terminology.1
+++ b/man/terminology.1
@@ -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
diff --git a/src/bin/media.c b/src/bin/media.c
index 29381a0..d715519 100644
--- a/src/bin/media.c
+++ b/src/bin/media.c
@@ -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);
-}
diff --git a/src/bin/media.h b/src/bin/media.h
index 5f33cd4..014ed8f 100644
--- a/src/bin/media.h
+++ b/src/bin/media.h
@@ -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
diff --git a/src/bin/win.c b/src/bin/win.c
index 5b3dd01..75c7cd8 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -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
{