Merge cedar into mozilla-central
authorBoris Zbarsky <bzbarsky@mit.edu>
Tue, 05 Apr 2011 09:19:34 -0700
changeset 64674 385684ad7eed256c1710d37e31da6c3e3a92837d
parent 64673 7fc2d583504454bd0dfd7a35b6a07670aa55639e (current diff)
parent 64652 f76c34fd72288f0c3b8bb2467043a0068e3e7a18 (diff)
child 64675 a8a0a7b518925d3256723cf17907124e0311ae07
child 67568 0e91598cc3f9c69f951c1d2ed50056488ca5f62e
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.2a1pre
first release with
nightly linux32
385684ad7eed / 4.2a1pre / 20110406030427 / files
nightly linux64
385684ad7eed / 4.2a1pre / 20110406030427 / files
nightly mac
385684ad7eed / 4.2a1pre / 20110406030427 / files
nightly win32
385684ad7eed / 4.2a1pre / 20110406030427 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Merge cedar into mozilla-central
configure.in
--- a/configure.in
+++ b/configure.in
@@ -5640,16 +5640,21 @@ then
 
     AC_SUBST(MOZ_ENABLE_GIO)
     AC_SUBST(MOZ_GIO_CFLAGS)
     AC_SUBST(MOZ_GIO_LIBS)
    
     dnl ========================================================
     dnl = GConf support module
     dnl ========================================================
+    MOZ_ARG_DISABLE_BOOL(gconf,
+    [  --disable-gconf      Disable Gconf support ],
+        MOZ_ENABLE_GCONF=,
+        MOZ_ENABLE_GCONF=force)
+
     if test "$MOZ_ENABLE_GCONF"
     then
         PKG_CHECK_MODULES(MOZ_GCONF, gconf-2.0 >= $GCONF_VERSION gobject-2.0 ,[
             MOZ_GCONF_LIBS=`echo $MOZ_GCONF_LIBS | sed 's/-llinc\>//'`
             MOZ_ENABLE_GCONF=1
         ],[
             if test "$MOZ_ENABLE_GCONF" = "force"
             then
--- a/toolkit/content/aboutSupport.js
+++ b/toolkit/content/aboutSupport.js
@@ -104,16 +104,26 @@ window.onload = function () {
   // Update the other sections.
   populatePreferencesSection();
   populateExtensionsSection();
   populateGraphicsSection();
 }
 
 function populateExtensionsSection() {
   AddonManager.getAddonsByTypes(["extension"], function(extensions) {
+    extensions.sort(function(a,b) {
+      if (a.isActive != b.isActive)
+        return b.isActive ? 1 : -1;
+      let lc = a.name.localeCompare(b.name);
+      if (lc != 0)
+        return lc;
+      if (a.version != b.version)
+        return a.version > b.version ? 1 : -1;
+      return 0;
+    });
     let trExtensions = [];
     for (let i = 0; i < extensions.length; i++) {
       let extension = extensions[i];
       let tr = createParentElement("tr", [
         createElement("td", extension.name),
         createElement("td", extension.version),
         createElement("td", extension.isActive),
         createElement("td", extension.id),
--- a/toolkit/themes/winstripe/mozapps/extensions/extensions.css
+++ b/toolkit/themes/winstripe/mozapps/extensions/extensions.css
@@ -370,21 +370,18 @@
 
 #header-search {
   margin: 0;
 }
 
 @media all and (-moz-windows-default-theme) {
   #header-search {
     -moz-appearance: none;
-    border: 1px solid;
-    border-color: rgba(0, 0, 0, 0.25) rgba(0, 0, 0, 0.32) rgba(0, 0, 0, 0.37);
-    border-radius: 4px;
-    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1) inset,
-                0 1px 0 rgba(255, 255, 255, 0.4);
+    border: 1px solid rgba(0, 0, 0, 0.32);
+    border-radius: 3.5px;
     padding-bottom: 2px;
     background-color: rgba(255, 255, 255, 0.4);
   }
 
   #header-search:hover {
     background-color: rgba(255, 255, 255, .75);
   }
 
@@ -1172,17 +1169,17 @@
 .header-button {
   -moz-appearance: none;
   padding: 1px 3px;
   color: #444;
   text-shadow: 0 0 3px white;
   background: -moz-linear-gradient(rgba(251, 252, 253, 0.95), rgba(246, 247, 248, 0) 49%, 
                                    rgba(211, 212, 213, 0.45) 51%, rgba(225, 226, 229, 0.3));
   background-clip: padding-box;
-  border-radius: 4.5px;
+  border-radius: 3.5px;
   border: 1px solid rgba(31, 64, 100, 0.4);
   border-top-color: rgba(31, 64, 100, 0.3);
   box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.25) inset,
               0 0 2px 1px rgba(255, 255, 255, 0.25) inset;
 }
 
 .header-button[disabled="true"] {
   opacity: 0.8;