зеркало из https://github.com/mozilla/pjs.git
undoing confusion in last two checkins
This commit is contained in:
Родитель
997acb5209
Коммит
5d8a8f5aed
|
@ -261,8 +261,6 @@ extern int PRVCY_POLICY_FILE_NAME;
|
||||||
PUBLIC void
|
PUBLIC void
|
||||||
PRVCY_CheckStandardLocation(MWContext * context)
|
PRVCY_CheckStandardLocation(MWContext * context)
|
||||||
{
|
{
|
||||||
XPDialogStrings *fileName = 0;
|
|
||||||
|
|
||||||
if (context) {
|
if (context) {
|
||||||
History_entry * entry = SHIST_GetCurrent(&context->hist);
|
History_entry * entry = SHIST_GetCurrent(&context->hist);
|
||||||
URL_Struct *pUrl;
|
URL_Struct *pUrl;
|
||||||
|
@ -284,13 +282,7 @@ PRVCY_CheckStandardLocation(MWContext * context)
|
||||||
/* Create a URL for privacy_policy.html */
|
/* Create a URL for privacy_policy.html */
|
||||||
privacyURL = NET_ParseURL(entry->address, GET_PROTOCOL_PART | GET_HOST_PART);
|
privacyURL = NET_ParseURL(entry->address, GET_PROTOCOL_PART | GET_HOST_PART);
|
||||||
StrAllocCat(privacyURL, "/");
|
StrAllocCat(privacyURL, "/");
|
||||||
|
StrAllocCat(privacyURL, XP_GetString(PRVCY_POLICY_FILE_NAME));
|
||||||
/* fixing a mess */
|
|
||||||
fileName = XP_GetDialogStrings(PRVCY_POLICY_FILE_NAME);
|
|
||||||
if (fileName) StrAllocCat(privacyURL, fileName->contents);
|
|
||||||
/* steve, this looks like a leak. what is the lifetime of the XPDialogStrings */
|
|
||||||
/* "fileName" above supposed to be? -joe */
|
|
||||||
|
|
||||||
if (prvcy_inCache(privacyURL, &found)) {
|
if (prvcy_inCache(privacyURL, &found)) {
|
||||||
if (found) {
|
if (found) {
|
||||||
entry->privacy_policy_url = privacyURL;
|
entry->privacy_policy_url = privacyURL;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче