From 52e165cf780d7a185a188842db6429c07c9f0947 Mon Sep 17 00:00:00 2001 From: Kelson Date: Tue, 26 Nov 2019 11:54:00 +0100 Subject: [PATCH 1/2] Reintroduce kiwix-serve taskbar --- ChangeLog | 5 +++++ src/server.cpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index ac4de7aaa..85b1d575e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +kiwix-lib 8.2.1 +=============== + + * Reintroduce kiwix-serve taskbar + kiwix-lib 8.2.0 =============== diff --git a/src/server.cpp b/src/server.cpp index 5ef30be12..180a1c101 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -870,6 +870,10 @@ Response InternalServer::handle_content(const RequestContext& request) zim::Blob raw_content = entry.getBlob(); content = string(raw_content.data(), raw_content.size()); auto response = get_default_response(); + + if (mimeType.find("text/html") != string::npos) + response.set_taskbar(bookName, reader->getTitle()); + response.set_mimeType(mimeType); response.set_content(content); response.set_compress(true); From e3c6ca0d1b178fee9771bc2991706370561cdb09 Mon Sep 17 00:00:00 2001 From: Kelson Date: Tue, 26 Nov 2019 11:54:39 +0100 Subject: [PATCH 2/2] Bump-up version to 8.2.1 --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index cca64cca7..c10317cc1 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('kiwix-lib', 'cpp', - version : '8.2.0', # Also change this in android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle + version : '8.2.1', # Also change this in android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle license : 'GPL', default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])