summaryrefslogtreecommitdiff
path: root/src/ephy-main.c
diff options
context:
space:
mode:
authorMichael Catanzaro <mcatanzaro@igalia.com>2018-01-15 07:26:44 -0600
committerMichael Catanzaro <mcatanzaro@igalia.com>2018-01-15 07:26:44 -0600
commit4c34c7e1b13148f1aa9997148cb1bb8f9b3416cc (patch)
tree5802f49394842dcf86fd1dab53597b50184eca68 /src/ephy-main.c
parent2da395047529d6aaf7a23e094ade18b5412c1f07 (diff)
downloadepiphany-4c34c7e1b13148f1aa9997148cb1bb8f9b3416cc.tar.gz
Use meson's vcs_tag(), but not for network requests
I just learned about meson's vcs_tag() function. We can use this to get rid of our compute-tech-preview-version.sh script. In implementing this, I discovered that we're sending the git hash along to the sync server and safe browsing server. Let's not do that. Only use the VCS version when displaying things locally, not in network requests.
Diffstat (limited to 'src/ephy-main.c')
-rw-r--r--src/ephy-main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 9c4687e16..321195029 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -29,6 +29,7 @@
#include "ephy-settings.h"
#include "ephy-shell.h"
#include "ephy-string.h"
+#include "ephy-vcs-version.h"
#include "ephy-web-app-utils.h"
#include <errno.h>
@@ -99,7 +100,7 @@ option_version_cb (const gchar *option_name,
gpointer data,
GError **error)
{
- g_print ("%s %s\n", _("Web"), VERSION);
+ g_print ("%s %s\n", _("Web"), VCSVERSION);
exit (EXIT_SUCCESS);
return FALSE;