Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: protz/GMail-Conversation-View
...
head fork: protz/GMail-Conversation-View
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Oct 08, 2012
@protz Missing line in chrome.manifest 0cfa5c8
Commits on Dec 03, 2012
@protz Merge branch 'master' of github.com:protz/GMail-Conversation-View d3a6226
@protz Fix broken display of messages.
This is due by the recent fix in bug 80855 that changed some function names...
1e3bf64
Showing with 6 additions and 2 deletions.
  1. +1 −0  chrome.manifest
  2. +5 −2 modules/message.js
View
1  chrome.manifest
@@ -1,6 +1,7 @@
content conversations content/
skin conversations classic/1.0 skin/
+#locale conversations ca locale/ca/
#locale conversations cs locale/cs/
#locale conversations da locale/da/
#locale conversations de locale/de/
View
7 modules/message.js
@@ -2044,13 +2044,16 @@ let PostStreamingFixesMixIn = {
let failsStaticTests = false;
if (linkText != linkUrl) {
+ // Bug 80855
+ let isLegalIpAddress = gPhishingDetector.hostNameIsIPAddress || gPhishingDetector.isLegalIPAddress;
+ let isLegalLocalIpAddress = gPhishingDetector.isLocalIPAddress || gPhishingDetector.isLegalLocalIPAddress;
// Yes, the third parameter to misMatchedHostWithLinkText is actually
// required, but it's some kind of an out value that's useless for
// us, so just pass it {} so that it's happy...
- let unobscuredHostNameValue = gPhishingDetector.hostNameIsIPAddress(hrefURL.host);
+ let unobscuredHostNameValue = isLegalIpAddress(hrefURL.host);
failsStaticTests =
unobscuredHostNameValue
- && !gPhishingDetector.isLocalIPAddress(unobscuredHostNameValue)
+ && !isLegalLocalIpAddress(unobscuredHostNameValue)
|| linkText
&& gPhishingDetector.misMatchedHostWithLinkText(hrefURL, linkText, {});
}

No commit comments for this range

Something went wrong with that request. Please try again.