Bug 586836 - Support Meego Network Managment [r=mfinkle]
authorJeremias Bosch <jeremias.bosch@gmail.com>
Thu, 02 Sep 2010 23:42:19 -0400
changeset 66529 56ef0d1784df463b8ae4fec7b6e8ebc9f98e5988
parent 66528 0ed34990f81ccd8c06f9967ece7eca5f9f409a57
child 66530 daf0be41cbc94b139a13f552542468b2ee17fa4e
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)
reviewersmfinkle
bugs586836
Bug 586836 - Support Meego Network Managment [r=mfinkle]
mobile/app/mobile.js
mobile/chrome/content/Util.js
--- a/mobile/app/mobile.js
+++ b/mobile/app/mobile.js
@@ -90,17 +90,17 @@ pref("network.http.pipelining", true);
 pref("network.http.pipelining.ssl", true);
 pref("network.http.proxy.pipelining", true);
 pref("network.http.pipelining.maxrequests" , 6);
 pref("network.http.keep-alive.timeout", 600);
 pref("network.http.max-connections", 6);
 pref("network.http.max-connections-per-server", 4);
 pref("network.http.max-persistent-connections-per-server", 4);
 pref("network.http.max-persistent-connections-per-proxy", 4);
-#ifdef MOZ_ENABLE_LIBCONIC
+#ifdef MOZ_PLATFORM_MAEMO
 pref("network.autodial-helper.enabled", true);
 #endif
 
 /* history max results display */
 pref("browser.display.history.maxresults", 100);
 
 /* session history */
 pref("browser.sessionhistory.max_total_viewers", 1);
--- a/mobile/chrome/content/Util.js
+++ b/mobile/chrome/content/Util.js
@@ -203,17 +203,17 @@ let Util = {
     }
 
     return resultSoFar;
   },
 
   // Put the Mozilla networking code into a state that will kick the auto-connection
   // process.
   forceOnline: function forceOnline() {
-#ifdef MOZ_ENABLE_LIBCONIC
+#ifdef MOZ_PLATFORM_MAEMO
     Services.io.offline = false;
 #endif
   },
 
   /** Capitalize first letter of a string. */
   capitalize: function(str) {
     return str.charAt(0).toUpperCase() + str.substring(1);
   },