From 4c402205bb0b9844828ee0a0075a24d922a09172 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 5 Nov 2011 10:45:14 -0400
Subject: [PATCH] Fix 'popups' safeSet message.

---
 common/content/dactyl.js                | 2 +-
 common/content/tabs.js                  | 8 ++++----
 common/locale/en-US/messages.properties | 6 ++----
 common/modules/dom.jsm                  | 3 ++-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 7269b7c5..80386310 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -1470,7 +1470,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
             {
                 setter: function (value) {
                     prefs.safeSet("accessibility.typeaheadfind.enablesound", !value,
-                                  _("option.visualbell.safeSet"));
+                                  _("option.safeSet", "visualbell"));
                     return value;
                 }
             });
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 52dc762b..915fb500 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -1209,7 +1209,7 @@ var Tabs = Module("tabs", {
                         tabs.tabStyle.enabled = true;
                     else {
                         prefs.safeSet("browser.tabs.autoHide", value === "multitab",
-                                      _("option.showtabline.safeSet"));
+                                      _("option.safeSet", "showtabline"));
                         tabs.tabStyle.enabled = false;
                     }
 
@@ -1257,7 +1257,7 @@ var Tabs = Module("tabs", {
                             if (group[2])
                                 prefs.safeSet("browser.tabs." + group[2],
                                               !(valueSet["all"] ^ valueSet[group[0]]),
-                                              _("option.activate.safeSet"));
+                                              _("option.safeSet", "activate"));
                         return newValues;
                     }
                 });
@@ -1292,9 +1292,9 @@ var Tabs = Module("tabs", {
                         }
 
                         prefs.safeSet("browser.link.open_newwindow", open,
-                                      _("option.popups.safeSet"));
+                                      _("option.safeSet", "popups"));
                         prefs.safeSet("browser.link.open_newwindow.restriction", restriction,
-                                      _("option.popups.safeSet"));
+                                      _("option.safeSet", "popups"));
                         return values;
                     },
                     values: {
diff --git a/common/locale/en-US/messages.properties b/common/locale/en-US/messages.properties
index b82fe6e5..2a7ce15b 100644
--- a/common/locale/en-US/messages.properties
+++ b/common/locale/en-US/messages.properties
@@ -271,14 +271,12 @@ option.defaultValue = Default Value
 
 option.bufferLocal = buffer local
 
-option.activate.safeSet = See the 'activate' option.
+option.safeSet = See the '%S' option.
 option.guioptions.safeSet = See 'guioptions' scrollbar flags.
+
 option.hintkeys.duplicate = Duplicate keys not allowed
 # The string 'passkeys' must appear exactly, including U0027 apostrophes
 option.passkeys.passedBy = passed by 'passkeys'
-option.popups.safeSet = See the 'activate' option.
-option.showtabline.safeSet = See 'showtabline' option.
-option.visualbell.safeSet = See 'visualbell' option.
 
 pageinfo.s.ownerUnverified = %S (unverified)
 
diff --git a/common/modules/dom.jsm b/common/modules/dom.jsm
index 0db54092..909bb986 100644
--- a/common/modules/dom.jsm
+++ b/common/modules/dom.jsm
@@ -1272,7 +1272,8 @@ var DOM = Class("DOM", {
 
         types: Class.Memoize(function () iter(
             {
-                Mouse: "click mousedown mouseout mouseover mouseup " +
+                Mouse: "click mousedown mouseout mouseover mouseup dblclick " +
+                       "hover " +
                        "popupshowing popupshown popuphiding popuphidden " +
                        "contextmenu",
                 Key:   "keydown keypress keyup",