[tor-commits] [tor-browser/tor-browser-17.0.7esr-2] Prevent an exception due to disabling ctypes at compile-time.

[mikeperry@xxxxxxxxxxxxxx]

commit a230b064a7240c8e799f049157b790a829962825
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date:   Tue Jul 16 14:03:51 2013 -0700

    Prevent an exception due to disabling ctypes at compile-time.
    
    Telemetry will still be broken if it is enabled, but at least an uncaught
    exception isn't thrown by default.
---
 toolkit/components/telemetry/TelemetryPing.js |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/telemetry/TelemetryPing.js b/toolkit/components/telemetry/TelemetryPing.js
index d1ccc3e..412ffcd 100644
--- a/toolkit/components/telemetry/TelemetryPing.js
+++ b/toolkit/components/telemetry/TelemetryPing.js
@@ -12,7 +12,8 @@ Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/LightweightThemeManager.jsm");
-Cu.import("resource://gre/modules/ctypes.jsm"); 
+// ctypes can be disabled at compiletime..
+try { Cu.import("resource://gre/modules/ctypes.jsm"); } catch (e) { }
 
 // When modifying the payload in incompatible ways, please bump this version number
 const PAYLOAD_VERSION = 1;

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits