Back out Ventron's patch from bug 418131 due to build failures on debug machines.

toolkit/mozapps/update/src/nsUpdateService.js.in

@@ -1022,26 +1022,18 @@ function UpdateService() {
     LOG("UpdateService", "XPCOM ABI unknown: updates are not possible.");
   }
 
-  var osVersion;
-  var sysInfo = Components.classes["@mozilla.org/system-info;1"]
-                          .getService(Components.interfaces.nsIPropertyBag2);
   try {
-    osVersion = sysInfo.getProperty("name") + " " + sysInfo.getProperty("version");
+    var sysInfo =
+      Components.classes["@mozilla.org/system-info;1"]
+                .getService(Components.interfaces.nsIPropertyBag2);
+
+    gOSVersion = encodeURIComponent(sysInfo.getProperty("name") + " " +
+                                    sysInfo.getProperty("version"));
   }
   catch (e) {
     LOG("UpdateService", "OS Version unknown: updates are not possible.");
   }
 
-  if (osVersion) {
-    try {
-      osVersion += " (" + sysInfo.getProperty("secondaryLibrary") + ")";
-    }
-    catch (e) {
-      // Not all platforms have a secondary widget library, so an error is nothing to worry about.
-    }
-    gOSVersion = encodeURIComponent(osVersion);
-  }
-
 #ifdef XP_MACOSX
   // Mac universal build should report a different ABI than either macppc
   // or mactel.

xpcom/base/Makefile.in

@@ -142,14 +142,7 @@ FORCE_STATIC_LIB = 1
 # Force use of PIC
 FORCE_USE_PIC	= 1
 
-ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
-EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
-endif
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_COM
 
-ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
-CXXFLAGS        += $(MOZ_GTK2_CFLAGS)
-endif

xpcom/base/nsSystemInfo.cpp

@@ -39,11 +39,6 @@
 #include "nsSystemInfo.h"
 #include "prsystem.h"
 #include "nsString.h"
-#include "prprf.h"
-
-#ifdef MOZ_WIDGET_GTK2
-#include <gtk/gtk.h>
-#endif
 
 nsSystemInfo::nsSystemInfo()
 {
@@ -79,15 +74,6 @@ nsSystemInfo::Init()
       else
         NS_WARNING("PR_GetSystemInfo failed");
     }
-
-#ifdef MOZ_WIDGET_GTK2
-    // This must be done here because NSPR can only separate OS's when compiled, not libraries.
-    char gtkver[15];
-    PR_snprintf(gtkver, sizeof(gtkver), "GTK %d.%d.%d", gtk_major_version, gtk_minor_version, gtk_micro_version);
-    rv = SetPropertyAsACString(NS_ConvertASCIItoUTF16("secondaryLibrary"),
-                               nsDependentCString(gtkver));
-    NS_ENSURE_SUCCESS(rv, rv);
-#endif
    
     return NS_OK;
 }