Netsurf: switch to KolibriUI & fixes in curl

git-svn-id: svn://kolibrios.org@3624 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Dmitry Pereverzev (SoUrcerer) 2013-06-07 23:03:35 +00:00
parent b003b0826c
commit b419853b1e
2 changed files with 13 additions and 8 deletions

View File

@ -436,8 +436,11 @@ static void fetch_curl_process(struct fetch_curl_context *ctx) {
* fetch_file_send_callback(). * fetch_file_send_callback().
*/ */
/* content type */ __menuet__debug_out(fetch_filetype(ctx->path));
if (fetch_curl_send_header(ctx, "Content-Type: text/html")) __menuet__debug_out("\n");
if (fetch_curl_send_header(ctx, "Content-Type: %s",
fetch_filetype(ctx->path)))
goto fetch_file_process_aborted; goto fetch_file_process_aborted;

View File

@ -427,8 +427,8 @@ process_cmdline(int argc, char** argv)
LOG(("argc %d, argv %p", argc, argv)); LOG(("argc %d, argv %p", argc, argv));
fename = "sdl"; fename = "kolibri";
febpp = 16; febpp = 32;
if ((nsoption_int(window_width) != 0) && if ((nsoption_int(window_width) != 0) &&
(nsoption_int(window_height) != 0)) { (nsoption_int(window_height) != 0)) {
@ -543,15 +543,17 @@ main(int argc, char** argv)
LOG(("Registering surfaces for SDL and RAM..")); LOG(("Registering surfaces for SDL and RAM.."));
extern nsfb_surface_rtns_t sdl_rtns; //extern nsfb_surface_rtns_t sdl_rtns;
extern nsfb_surface_rtns_t ram_rtns; extern nsfb_surface_rtns_t ram_rtns;
extern nsfb_surface_rtns_t able_rtns; extern nsfb_surface_rtns_t able_rtns;
extern nsfb_surface_rtns_t kolibri_rtns;
_nsfb_register_surface(NSFB_SURFACE_SDL, &sdl_rtns, "sdl"); //_nsfb_register_surface(NSFB_SURFACE_SDL, &sdl_rtns, "sdl");
_nsfb_register_surface(NSFB_SURFACE_RAM, &ram_rtns, "ram"); _nsfb_register_surface(NSFB_SURFACE_RAM, &ram_rtns, "ram");
_nsfb_register_surface(NSFB_SURFACE_RAM, &able_rtns, "able"); _nsfb_register_surface(NSFB_SURFACE_ABLE, &able_rtns, "able");
_nsfb_register_surface(NSFB_SURFACE_KOLIBRI, &kolibri_rtns, "kolibri");
respaths = fb_init_resource("/tmp9/1/netsurf/res/:res/:fonts/"); respaths = fb_init_resource("/hd0/1/res/:/bd0/1/res/:/tmp9/1/netsurf/res/:res/:fonts/");
options = filepath_find(respaths, "Choices"); options = filepath_find(respaths, "Choices");
messages = filepath_find(respaths, "messages"); messages = filepath_find(respaths, "messages");