From 0690da1804a570fe5f9042d71d21560fa6d6f2ae Mon Sep 17 00:00:00 2001 From: Christopher Aillon Date: Thu, 17 Feb 2011 13:51:05 +0100 Subject: [PATCH] Bug 629833 - Remove the toolkit.networkmanager.disabled pref r=roc a=beltzner --- modules/libpref/src/init/all.js | 6 ------ toolkit/system/dbus/nsNetworkManagerListener.cpp | 13 +------------ 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index a02a1522e32..64d8371686e 100644 --- a/modules/libpref/src/init/all.js +++ b/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"); diff --git a/toolkit/system/dbus/nsNetworkManagerListener.cpp b/toolkit/system/dbus/nsNetworkManagerListener.cpp index 42e2d8edf2d..92e69c200ed 100644 --- a/toolkit/system/dbus/nsNetworkManagerListener.cpp +++ b/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 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(); } +