There is no FaviconService on Fennec...

diegocr · Jun 3, 2014 · a1c5538 · a1c5538
1 parent da00f48
commit a1c5538
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/bootstrap.js b/bootstrap.js
@@ -28,7 +28,8 @@ let _ = (function(strings) {
 	return function _(key) strings.GetStringFromName(key);
 })(Services.strings.createBundle("chrome://cleanlinks/locale/browser.properties"));
 
-let FaviconService = Cc["@mozilla.org/browser/favicon-service;1"]
+let FaviconService = Cc["@mozilla.org/browser/favicon-service;1"];
+FaviconService = FaviconService && FaviconService
 	.getService(Ci.nsIFaviconService).QueryInterface(Ci.mozIAsyncFavicons);
 
 let i$ = {

diff --git a/browser.js b/browser.js
@@ -379,7 +379,7 @@ const cleanlinks = {
 	tcl: function(n) {
 		let c,p,t,s = n.ownerDocument.defaultView.getSelection();
 
-		this.d(['SEL', s.isCollapsed, s.focusNode&&s.focusNode.data, s.focusOffset]);
+		// this.d(['SEL', s.isCollapsed, s.focusNode&&s.focusNode.data, s.focusOffset]);
 
 		if(s.isCollapsed && s.focusNode && s.focusNode.data && (p=s.focusOffset)) {
 			let zx = ' "\'<>\n\r\t()[]|';
@@ -392,10 +392,10 @@ const cleanlinks = {
 				t = t.shift().trim().replace(RegExp("["+zx.replace(/(.)/g,'\\$1')+"]+$"),'');
 				if(!~t.indexOf('://')) t = 'http://'+t;
 			}
-			this.d(['RES',p,t,c]);
+			// this.d(['RES',p,t,c]);
 		}
 
-		this.d(['TEXTCL ' + t]);
+		// this.d(['TEXTCL ' + t]);
 
 		return t;
 	},

diff --git a/install.rdf b/install.rdf
@@ -4,7 +4,7 @@
 		<em:id>{158d7cb3-7039-4a75-8e0b-3bd0a464edd2}</em:id>
 		<em:type>2</em:type>
 		<em:name>Clean Links</em:name>
-		<em:version>2.6a2</em:version>
+		<em:version>2.6.0</em:version>
 		<em:creator>Diego Casorran</em:creator>
 		<em:contributor>Simon Chan</em:contributor>
 		<em:description>Converts obfuscated/nested links to genuine clean links</em:description>