forked from Lainports/freebsd-ports
98ff1f74fb
- Update firefox and thunderbird to 16.0 - Update seamonkey to 2.13 - Update all -i18n ports respectively - switch firefox 16.0 and seamonkey 2.13 to ALSA by default for better latency during pause and seeking with HTML5 video - remove fedisableexcept() hacks, obsolete since FreeBSD 4.0 - support system hunspell dictionaries [1] - unbreak -esr ports with clang3.2 [2] - unbreak nss build when CC contains full path [3] - remove GNOME option grouping [4] - integrate enigmail into thunderbird/seamonkey as an option [5] - remove mail/enigmail* [6] - enable ENIGMAIL, LIGHTNING and GIO options by default - add more reporters in about:memory: page-faults-hard, page-faults-soft, resident, vsize - use bundled jemalloc 3.0.0 on FreeBSD < 10.0 for gecko 16.0, only heap-allocated reporter works in about:memory (see bug 762445) - use lrintf() instead of slow C cast in bundled libopus - use libjpeg-turbo's faster color conversion if available during build - record startup time for telemetry - use -z origin instead of hardcoding path to gecko runtime - fail early if incompatible libxul version is installed (in USE_GECKO) - *miscellaneous cleanups and fixups* PR: ports/171534 [1] PR: ports/171566 [2] PR: ports/172164 [3] PR: ports/172201 [4] Discussed with: ale, beat, Jan Beich [5] Approved by: ale [6] In collaboration with: Jan Beich <jbeich@tormail.org> Security: 6e5a9afd-12d3-11e2-b47d-c8600054b392 Feature safe: yes Approved by: portmgr (beat)
34 lines
1.4 KiB
Text
34 lines
1.4 KiB
Text
commit 5e354b9
|
|
Author: Chris Coulson <chris.coulson@canonical.com>
|
|
Date: Thu Jan 5 11:19:50 2012 +1300
|
|
|
|
Bug 696030 - Use MonitorAutoLock rather than MonitorAutoEnter in nsGIOProtocolHandler r=karlt
|
|
|
|
--HG--
|
|
extra : rebase_source : 6f3d1a49a07affab679e41cd8cf968d62c072299
|
|
---
|
|
extensions/gio/nsGIOProtocolHandler.cpp | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git extensions/gio/nsGIOProtocolHandler.cpp extensions/gio/nsGIOProtocolHandler.cpp
|
|
index 9347b6e..e8f153d 100644
|
|
--- extensions/gio/nsGIOProtocolHandler.cpp
|
|
+++ extensions/gio/nsGIOProtocolHandler.cpp
|
|
@@ -238,7 +238,7 @@ class nsGIOInputStream : public nsIInputStream
|
|
void
|
|
nsGIOInputStream::SetMountResult(MountOperationResult result, gint error_code)
|
|
{
|
|
- mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);
|
|
+ mozilla::MonitorAutoLock mon(mMonitorMountInProgress);
|
|
mMountRes = result;
|
|
mMountErrorCode = error_code;
|
|
mon.Notify();
|
|
@@ -263,7 +263,7 @@ nsGIOInputStream::MountVolume() {
|
|
NULL,
|
|
mount_enclosing_volume_finished,
|
|
this);
|
|
- mozilla::MonitorAutoEnter mon(mMonitorMountInProgress);
|
|
+ mozilla::MonitorAutoLock mon(mMonitorMountInProgress);
|
|
/* Waiting for finish of mount operation thread */
|
|
while (mMountRes == MOUNT_OPERATION_IN_PROGRESS)
|
|
mon.Wait();
|