[Pkg-mozext-commits] [firebug] 40/48: Issue 7489: Updating from 1.12 to 2.0 causes the Start Button to be removed from the toolbar

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firebug.

commit 43a6e732990f5eb687df1cbb0235cac1a1594832
Author: Jan Odvarko <odvarko at gmail.com>
Date:   Fri May 30 16:03:11 2014 +0200

    Issue 7489: Updating from 1.12 to 2.0 causes the Start Button to be removed from the toolbar
---
 extension/content/firebug/firefox/browserToolbar.js | 4 ++--
 extension/content/firebug/lib/options.js            | 2 +-
 extension/defaults/preferences/firebug.js           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extension/content/firebug/firefox/browserToolbar.js b/extension/content/firebug/firefox/browserToolbar.js
index f44aca4..bcdc730 100644
--- a/extension/content/firebug/firefox/browserToolbar.js
+++ b/extension/content/firebug/firefox/browserToolbar.js
@@ -98,9 +98,9 @@ var BrowserToolbar =
         // toolbarpalette check is for seamonkey, where it is in the document
         if ((!$(doc, "firebug-badged-button") ||
             $(doc, "firebug-badged-button").parentNode.tagName == "toolbarpalette") &&
-            !Options.get("toolbarCustomizationDone"))
+            !Options.get("toolbarCustomizationDone2"))
         {
-            Options.set("toolbarCustomizationDone", true);
+            Options.set("toolbarCustomizationDone2", true);
 
             // Get the current navigation bar button set (a string of button IDs) and append
             // ID of the Firebug start button into it.
diff --git a/extension/content/firebug/lib/options.js b/extension/content/firebug/lib/options.js
index f5d6ec4..459a135 100644
--- a/extension/content/firebug/lib/options.js
+++ b/extension/content/firebug/lib/options.js
@@ -28,7 +28,7 @@ var prefNames =  // XXXjjb TODO distribute to modules
     "commandEditor", "textWrapWidth", "framePosition", "showErrorCount",
     "activateSameOrigin", "allPagesActivation",
     "panelTabMinWidth", "sourceLinkLabelWidth", "currentVersion",
-    "useDefaultLocale", "toolbarCustomizationDone",
+    "useDefaultLocale", "toolbarCustomizationDone2",
     "showBreakNotification", "stringCropLength", "showFirstRunPage",
 
     // Search
diff --git a/extension/defaults/preferences/firebug.js b/extension/defaults/preferences/firebug.js
index f848b8e..65ceb8e 100644
--- a/extension/defaults/preferences/firebug.js
+++ b/extension/defaults/preferences/firebug.js
@@ -21,7 +21,7 @@ pref("extensions.firebug.currentVersion", "");
 pref("extensions.firebug.showFirstRunPage", true);
 pref("extensions.firebug.useDefaultLocale", false);
 pref("extensions.firebug.activateSameOrigin", true);
-pref("extensions.firebug.toolbarCustomizationDone", false);
+pref("extensions.firebug.toolbarCustomizationDone2", false);
 pref("extensions.firebug.showBreakNotification", true);
 pref("extensions.firebug.stringCropLength", 50);
 pref("extensions.firebug.hideDefaultInspector", false);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firebug.git