Bug 629833 - Remove the toolkit.networkmanager.disabled pref

r=roc a=beltzner

modules/libpref/src/init/all.js

@@ -2577,9 +2577,6 @@ pref("autocomplete.ungrab_during_mode_switch", true);
 // toggling to use the XUL filepicker
 pref("ui.allow_platform_file_picker", true);
 
-// should NetworkManager be authoritative for online/offline status?
-pref("toolkit.networkmanager.disable", true);
-
 pref("helpers.global_mime_types_file", "/etc/mime.types");
 pref("helpers.global_mailcap_file", "/etc/mailcap");
 pref("helpers.private_mime_types_file", "~/.mime.types");
@@ -2851,9 +2848,6 @@ pref("autocomplete.ungrab_during_mode_switch", true);
 // toggling to use the XUL filepicker
 pref("ui.allow_platform_file_picker", true);
 
-// should NetworkManager be authoritative for online/offline status?
-pref("toolkit.networkmanager.disable", true);
-
 pref("helpers.global_mime_types_file", "/etc/mime.types");
 pref("helpers.global_mailcap_file", "/etc/mailcap");
 pref("helpers.private_mime_types_file", "~/.mime.types");

toolkit/system/dbus/nsNetworkManagerListener.cpp

@@ -45,8 +45,6 @@
 #include "nsServiceManagerUtils.h"
 #include "nsIObserverService.h"
 #include "nsStringAPI.h"
-#include "nsIPrefBranch2.h"
-#include "nsIPrefService.h"
 
 // Define NetworkManager API constants. This avoids a dependency on
 // NetworkManager-devel.
@@ -190,16 +188,6 @@ nsNetworkManagerListener::UpdateNetworkStatus(DBusMessage* msg) {
                              DBUS_TYPE_INVALID))
     return;
 
-  // Don't update status if disabled by pref
-  nsCOMPtr<nsIPrefBranch2> prefs =
-    do_GetService(NS_PREFSERVICE_CONTRACTID);
-  if (prefs) {
-    PRBool ignore = PR_FALSE;
-    prefs->GetBoolPref("toolkit.networkmanager.disable", &ignore);
-    if (ignore)
-      return;
-  }
-
   mNetworkManagerActive = PR_TRUE;
   
   PRBool wasUp = mLinkUp;
@@ -209,3 +197,4 @@ nsNetworkManagerListener::UpdateNetworkStatus(DBusMessage* msg) {
 
   NotifyNetworkStatusObservers();
 }
+