wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 629833 - Remove the toolkit.networkmanager.disabled pref

Browse Source 
r=roc a=beltzner
This commit is contained in:
Christopher Aillon 2011-02-17 13:51:05 +01:00
parent 1ebeb8905e
commit b6017fd921
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/libpref/src/init/all.js
View File

@ -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");

13
toolkit/system/dbus/nsNetworkManagerListener.cpp
View File

@ -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();
}