Patch by Ma Jie: Basically - make Poorman (the webserver) work. Libhttpd from
Jef Poskanzer is providing the backend, but had to be adopted in some ways. Other issues in Poorman have been resolved. When testing the license integration, I stumbled over some AboutSystem bugs, basically clicking licenses would not open them. I fixed those in this patch, sorry for mixing that up. Note to Ma Jie: I changed the encoding of the libhttpd files to UTF-8! (This affects only the (C) glyph.) Thanks a lot for your awesome work on Poorman, it's really appreciated! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29906 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -565,7 +565,7 @@ AboutView::AboutView(const BRect &rect)
|
||||
_GetLicensesPath(licensesPath);
|
||||
|
||||
BPath mitPath(licensesPath);
|
||||
mitPath.Append("MIT license");
|
||||
mitPath.Append("MIT");
|
||||
|
||||
font.SetSize(be_bold_font->Size() + 4);
|
||||
font.SetFace(B_BOLD_FACE);
|
||||
@@ -808,6 +808,13 @@ AboutView::AboutView(const BRect &rect)
|
||||
// "http://www.opensound.com");
|
||||
// BSD license
|
||||
|
||||
// libhttpd copyright (used as Poorman backend)
|
||||
AddCopyrightEntry("libhttpd",
|
||||
"Copyright " B_UTF8_COPYRIGHT "1995,1998,1999,2000,2001 by "
|
||||
"Jef Poskanzer. All rights reserved.",
|
||||
Licenses("LibHTTPd", NULL),
|
||||
"http://www.acme.com/software/thttpd/");
|
||||
|
||||
#ifdef __INTEL__
|
||||
// Udis86 copyrights
|
||||
AddCopyrightEntry("Udis86",
|
||||
@@ -1018,7 +1025,7 @@ AboutView::AddCopyrightEntry(const char *name, const char *text,
|
||||
for (int32 i = 0; i < licenses.CountLicenses(); i++) {
|
||||
const char* license = licenses.LicenseAt(i);
|
||||
BString licensePath(licensesPath.Path());
|
||||
licensePath += license;
|
||||
licensePath << '/' << license;
|
||||
|
||||
if (i > 0)
|
||||
fCreditsView->Insert(", ");
|
||||
|
||||
Reference in New Issue
Block a user