90337 - urlbar not responsive to enter key, r=hyatt, sr=blake, a=roc

2006-09-14 06:03:30 +00:00 · 2006-09-14 06:03:30 +00:00 · c1362a9f20
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@ -1424,7 +1424,13 @@ function handleURLBarRevert()

 function handleURLBarCommand(aUserAction, aTriggeringEvent)
 {
-  addToUrlbarHistory();
+  try { 
+    addToUrlbarHistory();
+  } catch (ex) {
+    // Things may go wrong when adding url to session history,
+    // but don't let that interfere with the loading of the url.
+  }
+  
  BrowserLoadURL(aTriggeringEvent); 
 }

--- a/suite/browser/urlbarBindings.xml
+++ b/suite/browser/urlbarBindings.xml
@ -200,7 +200,12 @@
        <body><![CDATA[
          var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"]
                      .getService(Components.interfaces.nsIRDFService);
-          var ds = rdf.GetDataSource("rdf:internetsearch");
+          try {
+            var ds = rdf.GetDataSource("rdf:internetsearch");
+          } catch (ex) {
+            // sometimes bad profiles cause this error, which horks the hold urlbar
+            return;
+          }
                              
          const kNC_Name = rdf.GetResource("http://home.netscape.com/NC-rdf#Name");
          const kNC_Icon = rdf.GetResource("http://home.netscape.com/NC-rdf#Icon");