smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #297 from kiwix/reintroduce-taskbar 

Reintroduce taskbar
This commit is contained in:
Kelson 2019-11-26 08:55:19 -05:00 committed by GitHub
parent 3b7c805183 e3c6ca0d1b
commit ea3349f37c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
kiwix-lib 8.2.1
===============
* Reintroduce kiwix-serve taskbar
kiwix-lib 8.2.0 kiwix-lib 8.2.0
=============== ===============

2
meson.build
View File

@ -1,5 +1,5 @@
project('kiwix-lib', 'cpp', 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', license : 'GPL',
default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true']) default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true'])

4
src/server.cpp
View File

@ -870,6 +870,10 @@ Response InternalServer::handle_content(const RequestContext& request)
zim::Blob raw_content = entry.getBlob(); zim::Blob raw_content = entry.getBlob();
content = string(raw_content.data(), raw_content.size()); content = string(raw_content.data(), raw_content.size());
auto response = get_default_response(); auto response = get_default_response();
if (mimeType.find("text/html") != string::npos)
response.set_taskbar(bookName, reader->getTitle());
response.set_mimeType(mimeType); response.set_mimeType(mimeType);
response.set_content(content); response.set_content(content);
response.set_compress(true); response.set_compress(true);