2015-05-20 Stefan Martens:

* ported fixes to make checkplaces work with recent Firefox again

diff -r checkplaces-2.6.2B/chrome/content/options.xul checkplaces-2.6.5/chrome/content/options.xul
43c43
<         title="&title; 2.6.2"
---
>         title="&title; 2.6.5"
diff -r checkplaces-2.6.2B/chrome/content/progress.js checkplaces-2.6.5/chrome/content/progress.js
162c162
< 				//Ignore queries
---
>  				//Ignore queries
230a231,270
> 				else if (checkContents && CheckPlacesProgress.nodeIsLivemarkContainer(child)) {
>           if (!excluded) cpp.livemarkCount++;
> 					isEmpty = false;
> 					var feedURI = null;
> 					var siteURI = null;
> 					if (child.itemId) {
> 						try {
>             
>                 PlacesUtils.livemarks.getLivemark ({id: child.itemId}, 
>                 function(aStatus, aLivemark){
>                           feedURI = aLivemark.feedURI.spec;
>                           siteURI = aLivemark.siteURI.spec;
>                           if (feedURI) {
> 						                  if (excluded) {
> 							                    cpp.addItemToList("excluded", excludedString, feedURI, child.itemId);
> 							 
> 						                  }
> 						                  else if (notDuplicate(feedURI, child) && checkLinks) {
> 							                        cpp.checkLink(cpp.useHead, child, feedURI);
> 						                       }
> 					                }
> 					                else if (excluded) {
> 						                      cpp.addItemToList("excluded", excludedString, "", child.itemId);
> 						
> 					                     }
> 
>                         }
>                 );
>             
>              }
>             
> 						catch(e) {
> 							alert (e, e.message);
>               if (!excluded) {
> 								if (!cpp.cancelled) Components.utils.reportError(e);
> 								cpp.addItemToList("bad", cpp.bundle.GetStringFromName('bad_feeduri'), "", child.itemId);
> 							}
>             }
> 					}
> 				}
269,270c309,310
< 					//First time duplicate found add the original as well
< 					if (!foundDuplicate) {
---
> 					//First time duplicate found add the original as well (but not for livemarks)
> 					if (!foundDuplicate && !CheckPlacesProgress.nodeIsLivemarkContainer(child)) {
1009c1049,1074
< 	}
---
> 	},
> 
>  nodeIsLivemarkContainer: function (aNode) {
>         return PlacesUtils.nodeIsFolder(aNode) && PlacesUtils.annotations.itemHasAnnotation(aNode.itemId, PlacesUtils.LMANNO_FEEDURI); 
>     },
> 
>  getURI: function (aNode, typeOfURI) {
>        
>         var anURI;
>         var completed = this;
>         
>         completed.onCompletion = function (aStatus, aLivemark){ 
>               if (typeOfURI = "siteURI"){
>                   anURI=aLivemark.siteURI;
>               } else{
>                   anURI=aLivemark.feedURI;
>               }
>         };
>         try {
>             PlacesUtils.livemarks.getLivemark ({id: aNode.itemId}, completed);
>             }
>             catch(e) {
>             alert (e);
>             };
>         return anURI;
>    }
diff -r checkplaces-2.6.2B/install.rdf checkplaces-2.6.5/install.rdf
8c8
<     <em:version>2.6.2B</em:version>
---
>     <em:version>2.6.5</em:version>
11c11
<     <em:homepageURL>http://www.andyhalford.com/checkplaces/index.html</em:homepageURL>
---
>     <em:homepageURL>http://web.archive.org/web/*/andyhalford.com</em:homepageURL>
37c37
< 				<em:maxVersion>22.*</em:maxVersion>
---
> 				<em:maxVersion>99.*</em:maxVersion>

2013-07-14 Scott Sanders:

* removed livemarks specific code from progress.js
* updated install.rdf (DL)
* updates maxversion to 22.* (DL)

diff -r orig/chrome/content/progress.js patch/chrome/content/progress.js
167,204d166
< 				else if (checkContents && PlacesUtils.nodeIsLivemarkContainer(child)) {
< 					if (!excluded) cpp.livemarkCount++;
< 					isEmpty = false;
< 					var feedURI = null;
< 					var siteURI = null;
< 					if (child.itemId) {
< 						try {
< 							feedURI = PlacesUtils.livemarks.getFeedURI(child.itemId);
< 						} catch(e) {
< 							if (!excluded) {
< 								if (!cpp.cancelled) Components.utils.reportError(e);
< 								cpp.addItemToList("bad", cpp.bundle.GetStringFromName('bad_feeduri'), "", child.itemId);
< 							}
< 						}
< 						try {
< 							siteURI = PlacesUtils.livemarks.getSiteURI(child.itemId);
< 						} catch(e) {
< 							if (!excluded) {
< 								if (!cpp.cancelled) Components.utils.reportError(e);
< 								cpp.addItemToList("bad", cpp.bundle.GetStringFromName('bad_siteuri'), "", child.itemId);
< 							}
< 						}
< 					}
< 
< 					if (feedURI) {
< 						if (excluded) {
< 							cpp.addItemToList("excluded", excludedString, feedURI.spec, child.itemId);
< 							continue;
< 						}
< 						else if (notDuplicate(feedURI.spec, child) && checkLinks) {
< 							cpp.checkLink(cpp.useHead, child, feedURI.spec);
< 						}
< 					}
< 					else if (excluded) {
< 						cpp.addItemToList("excluded", excludedString, "", child.itemId);
< 						continue;
< 					}
< 				}
diff -r orig/install.rdf patch/install.rdf
8c8
<     <em:version>2.6.2</em:version>
---
>     <em:version>2.6.2B</em:version>
37c37
< 				<em:maxVersion>13.*</em:maxVersion>
---
> 				<em:maxVersion>22.*</em:maxVersion>