summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2004-06-10 20:41:26 +0000
committerJames Bursa <james@netsurf-browser.org>2004-06-10 20:41:26 +0000
commit08177fa58119f9e67fdffb32ee20dbf05bd4fa78 (patch)
treedaa1124c9304e218045d12b9d531bd35e3a51565 /desktop
parentff5e70f86538bfd5a08a0ebbb7bc484ae9b841e6 (diff)
downloadnetsurf-08177fa58119f9e67fdffb32ee20dbf05bd4fa78.tar.gz
netsurf-08177fa58119f9e67fdffb32ee20dbf05bd4fa78.tar.bz2
[project @ 2004-06-10 20:41:26 by bursa]
Add global content list. Better error handling in content code. Improved code documentation. Remove some obsolete functions. Implement debug window listing contents. svn path=/import/netsurf/; revision=951
Diffstat (limited to 'desktop')
-rw-r--r--desktop/browser.c1
-rw-r--r--desktop/gui.h2
-rw-r--r--desktop/netsurf.c12
3 files changed, 5 insertions, 10 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 8f1bb9a0c..2c8c28441 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -260,6 +260,7 @@ void browser_window_callback(content_msg msg, struct content *c,
case CONTENT_MSG_ERROR:
browser_window_set_status(bw, data.error);
+ warn_user(data.error, 0);
if (c == bw->loading_content)
bw->loading_content = 0;
else if (c == bw->current_content)
diff --git a/desktop/gui.h b/desktop/gui.h
index d7f98609d..f388f2d7d 100644
--- a/desktop/gui.h
+++ b/desktop/gui.h
@@ -62,6 +62,4 @@ void gui_window_place_caret(gui_window *g, int x, int y, int height);
void gui_launch_url(const char *url);
-void warn_user(const char *warning, const char *detail);
-
#endif
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 106a33193..21f01177e 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -54,6 +54,7 @@ void netsurf_init(int argc, char** argv)
struct utsname utsname;
stdout = stderr;
+ curl_memdebug("memdump");
if (uname(&utsname) != 0)
LOG(("Failed to extract machine information\n"));
else
@@ -63,12 +64,6 @@ void netsurf_init(int argc, char** argv)
fetch_init();
cache_init();
fetchcache_init();
-#ifdef WITH_PNG
- nspng_init();
-#endif
-#ifdef WITH_GIF
- nsgif_init();
-#endif
url_init();
}
@@ -79,8 +74,9 @@ void netsurf_init(int argc, char** argv)
void netsurf_poll(void)
{
- gui_poll(fetch_active);
- fetch_poll();
+ content_clean();
+ gui_poll(fetch_active);
+ fetch_poll();
}