summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2007-01-13 00:21:15 +0000
committerJames Bursa <james@netsurf-browser.org>2007-01-13 00:21:15 +0000
commitbda01b31353e60fe4ad40d765de8ea1c396509bc (patch)
tree252891fdd2159e82e1f6287a92a8f14e6192a2da /desktop
parente76140557d804016563be73d8220c46a9c42ca7a (diff)
downloadnetsurf-bda01b31353e60fe4ad40d765de8ea1c396509bc.tar.gz
netsurf-bda01b31353e60fe4ad40d765de8ea1c396509bc.tar.bz2
Fix parsing error when an empty HTML data is returned. Add HTTP status and other information to status bar.
svn path=/trunk/netsurf/; revision=3140
Diffstat (limited to 'desktop')
-rw-r--r--desktop/browser.c8
-rw-r--r--desktop/browser.h2
2 files changed, 2 insertions, 8 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 628fbc9b3..b3fe85127 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -20,7 +20,6 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
-#include <time.h>
#include "curl/curl.h"
#include "netsurf/utils/config.h"
#include "netsurf/content/fetch.h"
@@ -286,7 +285,6 @@ void browser_window_go_post(struct browser_window *bw, const char *url,
browser_window_set_status(bw, messages_get("Loading"));
bw->history_add = history_add;
- bw->time0 = clock();
c = fetchcache(url2, browser_window_callback, (intptr_t) bw, 0,
width, height, false,
post_urlenc, post_multipart, true, download);
@@ -347,6 +345,7 @@ void browser_window_callback(content_msg msg, struct content *c,
url[sizeof url - 1] = 0;
gui_window_set_url(bw->window, url);
bw->refresh_interval = -1;
+ browser_window_set_status(bw, c->status_message);
}
break;
@@ -414,10 +413,7 @@ void browser_window_callback(content_msg msg, struct content *c,
assert(bw->current_content == c);
browser_window_update(bw, false);
- sprintf(status, messages_get("Complete"),
- ((float) (clock() - bw->time0)) /
- CLOCKS_PER_SEC);
- browser_window_set_status(bw, status);
+ browser_window_set_status(bw, c->status_message);
browser_window_stop_throbber(bw);
history_update(bw->history, c);
hotlist_visited(c);
diff --git a/desktop/browser.h b/desktop/browser.h
index c7bbaf8e3..8f0e74e89 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -74,8 +74,6 @@ struct browser_window {
bool throbbing;
/** Add loading_content to the window history when it loads. */
bool history_add;
- /** Start time of fetching loading_content. */
- clock_t time0;
/** Fragment identifier for current_content. */
char *frag_id;