mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-16 07:39:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2003-12-29 23:09:39 by jmb]

Browse Source 
Comment out frames-related stuff in the vain hope that it fixes bugs
some people are seeing.

svn path=/import/netsurf/; revision=471
This commit is contained in:
John Mark Bell 2003-12-29 23:09:39 +00:00
parent 3d7c7a7050
commit 76e2269df3
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
desktop/browser.c
View File

@ -130,6 +130,9 @@ struct browser_window* create_browser_window(int flags, int width, int height, s
bw->url = NULL; bw->url = NULL;
bw->caret_callback = 0; bw->caret_callback = 0;
bw->parent = NULL;
#if 0
bw->parent = parent; bw->parent = parent;
if (bw->parent != NULL) { if (bw->parent != NULL) {
@ -142,8 +145,13 @@ struct browser_window* create_browser_window(int flags, int width, int height, s
bw->window = NULL; /* This is filled in by frame_add_instance */ bw->window = NULL; /* This is filled in by frame_add_instance */
} }
else { else {
#endif
bw->window = gui_create_browser_window(bw); bw->window = gui_create_browser_window(bw);
#if 0
} }
#endif
return bw; return bw;
} }
@ -156,10 +164,10 @@ void browser_window_set_status(struct browser_window* bw, const char* text)
void browser_window_destroy(struct browser_window* bw, bool self) void browser_window_destroy(struct browser_window* bw, bool self)
{ {
unsigned int i; /*unsigned int i;*/
LOG(("bw = %p", bw)); LOG(("bw = %p", bw));
assert(bw != 0); assert(bw != 0);
#if 0
if (bw->no_children == 0 && bw->parent != NULL) { /* leaf node -> delete */ if (bw->no_children == 0 && bw->parent != NULL) { /* leaf node -> delete */
if (bw->current_content != NULL) { if (bw->current_content != NULL) {
if (bw->current_content->status == CONTENT_STATUS_DONE) if (bw->current_content->status == CONTENT_STATUS_DONE)
@ -178,6 +186,7 @@ void browser_window_destroy(struct browser_window* bw, bool self)
/* all children killed -> remove this node */ /* all children killed -> remove this node */
if (self || bw->parent != NULL) { if (self || bw->parent != NULL) {
#endif
if (bw->current_content != NULL) { if (bw->current_content != NULL) {
if (bw->current_content->status == CONTENT_STATUS_DONE) if (bw->current_content->status == CONTENT_STATUS_DONE)
content_remove_instance(bw->current_content, bw, 0, 0, 0, &bw->current_content_state); content_remove_instance(bw->current_content, bw, 0, 0, 0, &bw->current_content_state);
@ -190,13 +199,15 @@ void browser_window_destroy(struct browser_window* bw, bool self)
xfree(bw->url); xfree(bw->url);
gui_window_destroy(bw->window); gui_window_destroy(bw->window);
xfree(bw->children); /*xfree(bw->children);*/
xfree(bw); xfree(bw);
#if 0
} }
else { else {
bw->no_children = 0; bw->no_children = 0;
xfree(bw->children); xfree(bw->children);
} }
#endif
LOG(("end")); LOG(("end"));
} }
@ -212,8 +223,8 @@ void browser_window_open_location_historical(struct browser_window* bw,
/* Check window still exists, if not, don't bother going any further */ /* Check window still exists, if not, don't bother going any further */
if (!gui_window_in_list(bw->window)) return; if (!gui_window_in_list(bw->window)) return;
if (bw->url != NULL) /*if (bw->url != NULL)
browser_window_destroy(bw, false); browser_window_destroy(bw, false);*/
if ((li = login_list_get(url)) == NULL) { if ((li = login_list_get(url)) == NULL) {