Merge backout a=orange-bustage

2010-09-04 15:18:53 -04:00 · 2010-09-04 15:18:53 -04:00 · 9b5791b737
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@ -886,7 +886,7 @@
        <body>
          <![CDATA[
            aTab.label = this.mStringBundle.getString("tabs.loading");
-            aTab.setAttribute("crop", "end");
+            aTab.crop = "end";
            this._tabAttrModified(aTab);
          ]]>
        </body>
@ -931,7 +931,7 @@
              return false;

            aTab.label = title;
-            aTab.setAttribute("crop", crop);
+            aTab.crop = crop;
            this._tabAttrModified(aTab);
            return true;
          ]]>
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@ -3356,7 +3356,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
     }
     flagFile = do_QueryInterface(fFlagFile);
     if (flagFile) {
-       flagFile->SetNativeLeafName(FILE_INVALIDATE_CACHES);
+       flagFile->AppendNative(FILE_INVALIDATE_CACHES);
     }
 #endif
    PRBool cachesOK;