Attachment #414998 for bug #563572

Lines 1353-1359 var gApplicationsPane = { Link Here

(-)browser/components/preferences/applications.js.orig (-1 / +1 lines)
1353	_isValidHandlerExecutable: function(aExecutable) {	1353	_isValidHandlerExecutable: function(aExecutable) {
1354	return aExecutable &&	1354	return aExecutable &&
1355	aExecutable.exists() &&	1355	aExecutable.exists() &&
1356	aExecutable.isExecutable() &&	1356	aExecutable.isFile() &&
1357	// XXXben - we need to compare this with the running instance executable	1357	// XXXben - we need to compare this with the running instance executable
1358	// just don't know how to do that via script...	1358	// just don't know how to do that via script...
1359	// XXXmano TBD: can probably add this to nsIShellService	1359	// XXXmano TBD: can probably add this to nsIShellService





    try {
      file.initWithPath(aPath);

      if (file.exists())
        return file;
    }
    catch(ex) {
      // Note: for historical reasons, we don't actually check to see


      try {
        file.append(aPath);
        if (file.exists())
          return file;
      }
      catch(ex) {}
    }
    if (file && file.exists() &&
        file.isExecutable() &&
        file.isFile())
      return file;

    return null;
  },

Return to bug 563572

Lines 632-640 HandlerService.prototype = { Link Here

(-)uriloader/exthandler/nsHandlerService.js.orig (-5 / +4 lines)
632		632
633	try {	633	try {
634	file.initWithPath(aPath);	634	file.initWithPath(aPath);
635
636	if (file.exists())
637	return file;
638	}	635	}
639	catch(ex) {	636	catch(ex) {
640	// Note: for historical reasons, we don't actually check to see	637	// Note: for historical reasons, we don't actually check to see
Lines 645-655 HandlerService.prototype = { Link Here
645		642
646	try {	643	try {
647	file.append(aPath);	644	file.append(aPath);
648	if (file.exists())
649	return file;
650	}	645	}
651	catch(ex) {}	646	catch(ex) {}
652	}	647	}
		648	if (file && file.exists() &&
		649	file.isExecutable() &&
		650	file.isFile())
		651	return file;
653		652
654	return null;	653	return null;
655	},	654	},