commit: c3cadbabf760fd86a0b21bf1869e01653fa5dbbe
parent 3cff0fe5d4a6b8e28f75502979f5b19783f6bb3d
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Wed, 11 Mar 2020 16:03:07 +0100
Merge branch 'release-0.5' for 0.5.1
Diffstat:
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@
# - Usage of += for appending to a variable
PACKAGE = Badwolf
-VERSION = 0.5.0
+VERSION = 0.5.1
VERSION_FULL = $(VERSION)`./version.sh`
PREFIX ?= /usr/local
diff --git a/config.h b/config.h
@@ -73,6 +73,7 @@
"javascript-can-open-windows-automatically", FALSE, \
"media-playback-requires-user-gesture", TRUE, \
"minimum-font-size", 9, \
+ "allow-top-navigation-to-data-urls", FALSE, \
NULL
// clang-format on
diff --git a/keybindings.c b/keybindings.c
@@ -29,20 +29,20 @@ badwolf_about_dialog(GtkWindow *main_window, gpointer user_data)
char *comments = NULL;
- comments = g_strdup_printf(
- _("Minimalist and privacy-oriented WebKitGTK+ browser\n"
- "Runtime WebKit version: %d.%d.%d"),
- webkit_get_major_version(),
- webkit_get_minor_version(),
- webkit_get_micro_version());
+ comments = g_strdup_printf(_("Minimalist and privacy-oriented WebKitGTK+ browser\n"
+ "Runtime WebKit version: %d.%d.%d"),
+ webkit_get_major_version(),
+ webkit_get_minor_version(),
+ webkit_get_micro_version());
gtk_window_set_transient_for(GTK_WINDOW(about_dialog), main_window);
gtk_window_set_destroy_with_parent(GTK_WINDOW(about_dialog), TRUE);
gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(about_dialog),
"SPDX-License-Identifier: BSD-3-Clause");
- gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(about_dialog),
- "2019-2020 Badwolf Authors <https://hacktivis.me/projects/badwolf>");
+ gtk_about_dialog_set_copyright(
+ GTK_ABOUT_DIALOG(about_dialog),
+ "2019-2020 Badwolf Authors <https://hacktivis.me/projects/badwolf>");
gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about_dialog), homepage);
gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(about_dialog), comments);
gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about_dialog), version);
diff --git a/po/messages.pot b/po/messages.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: Badwolf 0.5.0-rc.1+g863073d\n"
+"Project-Id-Version: Badwolf 0.5.0+gcba1cf3\n"
"Report-Msgid-Bugs-To: contact+badwolf-msgid@hacktivis.me\n"
-"POT-Creation-Date: 2020-02-09 19:47+0100\n"
+"POT-Creation-Date: 2020-03-11 16:00+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,7 +65,7 @@ msgstr ""
msgid "Error: The given identity doesn't match the expected one.\n"
msgstr ""
-#: keybindings.c:33
+#: keybindings.c:32
#, c-format
msgid ""
"Minimalist and privacy-oriented WebKitGTK+ browser\n"