From 5148017d8d84726c4156995d22912853f627b5a7 Mon Sep 17 00:00:00 2001
From: Ian Bicking <ianb@colorstudy.com>
Date: Wed, 18 Jan 2017 14:55:54 -0600
Subject: [PATCH] Fix #2107, remove/comment-out hotkey

---
 addon/lib/main.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/addon/lib/main.js b/addon/lib/main.js
index 3fc4078270..597977c62c 100644
--- a/addon/lib/main.js
+++ b/addon/lib/main.js
@@ -19,7 +19,6 @@ const { watchFunction } = require("./errors");
 const { Cu } = require("chrome");
 const req = require("./req");
 const { setTimeout, clearTimeout } = require("sdk/timers");
-const { Hotkey } = require("sdk/hotkeys");
 const { AddonManager } = require('resource://gre/modules/AddonManager.jsm');
 const { addXULStylesheet } = require("./xulcss");
 const { storage } = require("sdk/simple-storage");
@@ -86,19 +85,16 @@ function takeShot(source) {
   }
 }
 
-Hotkey({
+/*
+Disabled because of conflicts with non-English keyboards:
+
+require("sdk/hotkeys").Hotkey({
   combo: "accel-alt-control-c",
   onPress: watchFunction(function() {
     takeShot("keyboard-shortcut");
   })
 });
-
-Hotkey({
-  combo: "accel-alt-control-x",
-  onPress: watchFunction(function() {
-    throw new Error("Client-side exception test");
-  })
-});
+*/
 
 contextMenu.Item({
   label: "Create Page Shot",