Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix for #309770. Porting "RefreshURLTimer" fix from 4.06 to Moz.

Browse Source
This commit is contained in:
pnunn%netscape.com 1998-09-09 19:11:22 +00:00
parent 28e94d9f5e
commit 23327d8cb9
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/xfe/xfe.c
View File

@ -2135,13 +2135,13 @@ fe_refresh_url_timer (XtPointer closure, XtIntervalId *id)
if (! CONTEXT_DATA (context)->refresh_url_timer_url) if (! CONTEXT_DATA (context)->refresh_url_timer_url)
return; return;
url = NET_CreateURLStruct (CONTEXT_DATA (context)->refresh_url_timer_url, url = NET_CreateURLStruct (CONTEXT_DATA (context)->refresh_url_timer_url,
NET_NORMAL_RELOAD); CONTEXT_DATA (context)->url_refresh_force_reload);
url->force_reload = NET_NORMAL_RELOAD; url->force_reload = CONTEXT_DATA (context)->url_refresh_force_reload ;
fe_GetURL (context, url, FALSE); fe_GetURL (context, url, FALSE);
} }
void void
FE_SetRefreshURLTimer (MWContext *context, uint32 secs, char *url) FE_SetRefreshURLTimer (MWContext *context, URL_Struct *URL_s)
{ {
if(context->type != MWContextBrowser) if(context->type != MWContextBrowser)
return; return;
@ -2151,13 +2151,21 @@ FE_SetRefreshURLTimer (MWContext *context, uint32 secs, char *url)
if (CONTEXT_DATA (context)->refresh_url_timer_url) if (CONTEXT_DATA (context)->refresh_url_timer_url)
free (CONTEXT_DATA (context)->refresh_url_timer_url); free (CONTEXT_DATA (context)->refresh_url_timer_url);
CONTEXT_DATA (context)->refresh_url_timer = 0; CONTEXT_DATA (context)->refresh_url_timer = 0;
CONTEXT_DATA (context)->refresh_url_timer_secs = secs; CONTEXT_DATA (context)->refresh_url_timer_secs = URL_s->refresh;
CONTEXT_DATA (context)->refresh_url_timer_url = strdup (url); CONTEXT_DATA (context)->refresh_url_timer_url = strdup (URL_s->refresh_url);
if (secs <= 0)
/* Place the force reload method into the fe data. We can't access this
* info in the fe_refresh_url_timer timeout */
if(URL_s->dont_cache)
CONTEXT_DATA (context)->url_refresh_force_reload = NET_SUPER_RELOAD;
else
CONTEXT_DATA (context)->url_refresh_force_reload = URL_s->force_reload;
if (URL_s->refresh <= 0)
fe_refresh_url_timer ((XtPointer) context, 0); fe_refresh_url_timer ((XtPointer) context, 0);
else else
CONTEXT_DATA (context)->refresh_url_timer = CONTEXT_DATA (context)->refresh_url_timer =
XtAppAddTimeOut (fe_XtAppContext, secs * 1000, XtAppAddTimeOut (fe_XtAppContext, URL_s->refresh * 1000,
fe_refresh_url_timer, (XtPointer) context); fe_refresh_url_timer, (XtPointer) context);
} }

2
network/main/mkgeturl.c
View File

@ -1092,7 +1092,7 @@ net_CallExitRoutine(Net_GetUrlExitFunc *exit_routine,
#ifdef MOZILLA_CLIENT #ifdef MOZILLA_CLIENT
if(URL_s->refresh_url && status != MK_INTERRUPTED) if(URL_s->refresh_url && status != MK_INTERRUPTED)
FE_SetRefreshURLTimer(window_id, URL_s->refresh, URL_s->refresh_url); FE_SetRefreshURLTimer(window_id, URL_s);
#endif /* MOZILLA_CLIENT */ #endif /* MOZILLA_CLIENT */
if (URL_s->pre_exit_fn) if (URL_s->pre_exit_fn)