Added fix for NM regression (mozbz#791626)
This commit is contained in:
parent
9f6609d328
commit
7fafacabbe
46
mozilla-791626.patch
Normal file
46
mozilla-791626.patch
Normal file
@ -0,0 +1,46 @@
|
||||
# HG changeset patch
|
||||
# Parent 3523e7f7a89d7933c5f1dc8f5f22559b48ec44c4
|
||||
diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp
|
||||
--- a/netwerk/base/src/nsIOService.cpp
|
||||
+++ b/netwerk/base/src/nsIOService.cpp
|
||||
@@ -818,17 +818,18 @@ nsIOService::PrefsChanged(nsIPrefBranch
|
||||
if (NS_SUCCEEDED(rv)) {
|
||||
if (mSocketTransportService)
|
||||
mSocketTransportService->SetAutodialEnabled(enableAutodial);
|
||||
}
|
||||
}
|
||||
|
||||
if (!pref || strcmp(pref, MANAGE_OFFLINE_STATUS_PREF) == 0) {
|
||||
bool manage;
|
||||
- if (NS_SUCCEEDED(prefs->GetBoolPref(MANAGE_OFFLINE_STATUS_PREF,
|
||||
+ if (mNetworkLinkServiceInitialized &&
|
||||
+ NS_SUCCEEDED(prefs->GetBoolPref(MANAGE_OFFLINE_STATUS_PREF,
|
||||
&manage)))
|
||||
SetManageOfflineStatus(manage);
|
||||
}
|
||||
|
||||
if (!pref || strcmp(pref, NECKO_BUFFER_CACHE_COUNT_PREF) == 0) {
|
||||
int32_t count;
|
||||
if (NS_SUCCEEDED(prefs->GetIntPref(NECKO_BUFFER_CACHE_COUNT_PREF,
|
||||
&count)))
|
||||
@@ -928,16 +929,20 @@ nsIOService::Observe(nsISupports *subjec
|
||||
}
|
||||
else if (!strcmp(topic, kProfileDoChange)) {
|
||||
if (data && NS_LITERAL_STRING("startup").Equals(data)) {
|
||||
// Lazy initialization of network link service (see bug 620472)
|
||||
InitializeNetworkLinkService();
|
||||
// Set up the initilization flag regardless the actuall result.
|
||||
// If we fail here, we will fail always on.
|
||||
mNetworkLinkServiceInitialized = true;
|
||||
+ // And now reflect the preference setting
|
||||
+ nsCOMPtr<nsIPrefBranch> prefBranch;
|
||||
+ GetPrefBranch(getter_AddRefs(prefBranch));
|
||||
+ PrefsChanged(prefBranch, MANAGE_OFFLINE_STATUS_PREF);
|
||||
}
|
||||
}
|
||||
else if (!strcmp(topic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
|
||||
// Remember we passed XPCOM shutdown notification to prevent any
|
||||
// changes of the offline status from now. We must not allow going
|
||||
// online after this point.
|
||||
mShutdown = true;
|
||||
|
@ -54,7 +54,7 @@
|
||||
Summary: Mozilla Thunderbird mail/newsgroup client
|
||||
Name: thunderbird
|
||||
Version: 17.0.2
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
URL: http://www.mozilla.org/projects/thunderbird/
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
Group: Applications/Internet
|
||||
@ -73,6 +73,7 @@ Source100: find-external-requires
|
||||
# Mozilla (XULRunner) patches
|
||||
Patch0: thunderbird-install-dir.patch
|
||||
Patch8: xulrunner-10.0-secondary-ipc.patch
|
||||
Patch9: mozilla-791626.patch
|
||||
|
||||
# Build patches
|
||||
Patch104: xulrunner-10.0-gcc47.patch
|
||||
@ -171,6 +172,7 @@ cd %{tarballdir}
|
||||
# Mozilla (XULRunner) patches
|
||||
cd mozilla
|
||||
%patch8 -p3 -b .secondary-ipc
|
||||
%patch9 -p1 -b .791626
|
||||
%patch104 -p1 -b .gcc47
|
||||
%patch302 -p2 -b .746112
|
||||
cd ..
|
||||
@ -449,6 +451,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#===============================================================================
|
||||
|
||||
%changelog
|
||||
* Tue Jan 15 2013 Martin Stransky <stransky@redhat.com> - 17.0.2-3
|
||||
- Added fix for NM regression (mozbz#791626)
|
||||
|
||||
* Tue Jan 15 2013 Jan Horak <jhorak@redhat.com> - 17.0.2-2
|
||||
- Added mozilla-746112 patch to fix crash on ppc(64)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user