Merging m-c into GECKO20b7pre_20101029_RELBRANCH per stuart/aki a=me

--HG-- branch : GECKO20b7pre_20101029_RELBRANCH
leto · Nov 2, 2010 · ee10e61 · ee10e61
2 parents f452fb8 + e66e086
commit ee10e61
Show file tree

Hide file tree

Showing 247 changed files with 7,693 additions and 5,348 deletions.
diff --git a/browser/base/content/aboutHome.css b/browser/base/content/aboutHome.css
@@ -104,6 +104,7 @@ body[dir="rtl"] #searchEngineLinks {
 }
 
 #searchText {
+  margin-bottom: 10px;
   width: 100%;
 }
 

diff --git a/browser/base/content/aboutHome.xhtml b/browser/base/content/aboutHome.xhtml
@@ -72,7 +72,6 @@
           <img id="searchEngineLogo"/>
           <form name="searchForm" onsubmit="onSearchSubmit(event)">
             <input type="text" name="searchText" value="" id="searchText" maxLength="256"/>
-            <br/>
             <input type="submit" value="&abouthome.searchEngineButton.label;"/>
             <span id="searchEngineLinks">
               <a hidden="true" id="searchEngineAdvancedLink">&abouthome.searchEngineLinks.advanced;</a>

diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
diff --git a/browser/base/content/test/browser_bug553455.js b/browser/base/content/test/browser_bug553455.js
@@ -597,7 +597,7 @@ var XPInstallObserver = {
 };
 
 function test() {
-  requestLongerTimeout(2);
+  requestLongerTimeout(4);
   waitForExplicitFinish();
 
   Services.prefs.setBoolPref("extensions.logging.enabled", true);

diff --git a/browser/base/content/test/tabview/browser_tabview_launch.js b/browser/base/content/test/tabview/browser_tabview_launch.js
@@ -55,13 +55,28 @@ function test() {
 function onTabViewLoadedAndShown() {
   window.removeEventListener("tabviewshown", onTabViewLoadedAndShown, false);
 
-  ok(TabView.isVisible(), "Tab View is visible. Count: " + tabViewShownCount);
+  // Evidently sometimes isVisible (which is based on the selectedIndex of the
-  tabViewShownCount++;
+  // tabview deck) isn't updated immediately when called from button.doCommand,
+  // so we add a little timeout here to get outside of the doCommand call.
+  // If the initial timeout isn't enough, we keep waiting in case it's taking
+  // longer than expected.
+  // See bug 594909.
+  let deck = document.getElementById("tab-view-deck");
+  function waitForSwitch() {
+    if (deck.selectedIndex == 1) {
+      ok(TabView.isVisible(), "Tab View is visible. Count: " + tabViewShownCount);
+      tabViewShownCount++;
+
+      // kick off the series
+      window.addEventListener("tabviewshown", onTabViewShown, false);
+      window.addEventListener("tabviewhidden", onTabViewHidden, false);
+      TabView.toggle();
+    } else {
+      setTimeout(waitForSwitch, 10);
+    }
+  }
 
-  // kick off the series
+  setTimeout(waitForSwitch, 1);
-  window.addEventListener("tabviewshown", onTabViewShown, false);
-  window.addEventListener("tabviewhidden", onTabViewHidden, false);
-  TabView.toggle();
 }
 
 // ----------

diff --git a/browser/locales/all-locales b/browser/locales/all-locales
@@ -2,6 +2,7 @@ af
 ak
 ar
 as
+ast
 be
 bg
 bn-BD
@@ -18,6 +19,7 @@ en-GB
 en-ZA
 eo
 es-AR
+es-CL
 es-ES
 es-MX
 et
@@ -27,6 +29,7 @@ fi
 fr
 fy-NL
 ga-IE
+gd
 gl
 gu-IN
 he
@@ -40,12 +43,14 @@ it
 ja
 ja-JP-mac
 ka
+km
 kn
 ko
 ku
 lg
 lt
 lv
+mai
 mk
 ml
 mn
@@ -71,6 +76,7 @@ sq
 sr
 sv-SE
 ta
+ta-LK
 te
 th
 tr

diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -71,7 +71,7 @@ can reach it easily. -->
 <!ENTITY personalbarCmd.accesskey "B">
 <!ENTITY bookmarksToolbarItem.label "Bookmarks Toolbar Items">
 <!ENTITY addonBarCmd.label "Add-on Bar">
-<!ENTITY addonBarCmd.accesskey "B">
+<!ENTITY addonBarCmd.accesskey "A">
 
 <!ENTITY pageSourceCmd.label "Page Source">
 <!ENTITY pageSourceCmd.accesskey "o">

diff --git a/browser/locales/shipped-locales b/browser/locales/shipped-locales
@@ -17,10 +17,12 @@ eo
 es-AR
 es-ES
 et
+eu
 fi
 fr
 fy-NL
 ga-IE
+gd
 he
 hu
 hy-AM
@@ -34,6 +36,7 @@ ku
 lg
 lt
 lv
+mk
 nb-NO
 nl
 nn-NO
@@ -42,6 +45,7 @@ pa-IN
 pl
 pt-BR
 pt-PT
+rm
 ro
 ru
 sk

diff --git a/build/mobile/sutagent/android/AndroidManifest.xml b/build/mobile/sutagent/android/AndroidManifest.xml
@@ -65,4 +65,7 @@
 <uses-permission android:name="android.permission.SET_TIME"></uses-permission>
 
 
+
+<uses-permission android:name="android.permission.SET_TIME_ZONE"></uses-permission>
+
 </manifest>