From 500db377081c28370b47ee73e0e213a7aca482a9 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Fri, 12 Aug 2011 17:42:08 -0400
Subject: [PATCH] Merge the globals of multiple plugins of the same name.

---
 common/modules/contexts.jsm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/common/modules/contexts.jsm b/common/modules/contexts.jsm
index 9dad270b..319ccbec 100644
--- a/common/modules/contexts.jsm
+++ b/common/modules/contexts.jsm
@@ -182,20 +182,24 @@ var Contexts = Module("contexts", {
                                   function (dir) dir.contains(file, true),
                                   0);
 
+        let name = isPlugin ? file.getRelativeDescriptor(isPlugin).replace(File.PATH_SEP, "-")
+                            : file.leafName;
+        let id   = name.replace(/\.[^.]*$/, "").replace(/-([a-z])/g, function (m, n1) n1.toUpperCase());
+
         let contextPath = file.path;
         let self = Set.has(plugins, contextPath) && plugins.contexts[contextPath];
 
+        if (!self && isPlugin)
+            self = Set.has(plugins, id) && plugins[id];
+
         if (self) {
             if (Set.has(self, "onUnload"))
                 self.onUnload();
         }
         else {
-            let name = isPlugin ? file.getRelativeDescriptor(isPlugin).replace(File.PATH_SEP, "-")
-                                : file.leafName;
-
             self = args && !isArray(args) ? args : newContext.apply(null, args || [userContext]);
             update(self, {
-                NAME: Const(name.replace(/\.[^.]*$/, "").replace(/-([a-z])/g, function (m, n1) n1.toUpperCase())),
+                NAME: Const(id),
 
                 PATH: Const(file.path),