Ticket #53: greasemonkey-songbird-patch.2.diff

trunk/src/chrome.manifest

@@ -1 +1 @@
-content    greasemonkey    chrome/chromeFiles/content/
-overlay    chrome://browser/content/browser.xul    chrome://greasemonkey/content/browser.xul
+overlay    chrome://songbird/content/xul/mainScriptsOverlay.xul    chrome://greasemonkey/content/browser.xul
-locale  greasemonkey  en-US  chrome/chromeFiles/locale/en-US/

trunk/src/chrome/chromeFiles/content/browser.js

@@ -11 +11 @@
-GM_BrowserUI.QueryInterface = function(aIID) {
-  if (!aIID.equals(Components.interfaces.nsISupports) &&
-      !aIID.equals(Components.interfaces.gmIBrowserWindow) &&
-
+
+
-    throw Components.results.NS_ERROR_NO_INTERFACE;
-
-  return this;
@@ -55 +56 @@
-    this.toolsMenu = document.getElementById("taskPopup");
-  }
-
+  // songbird compat
+  if (!this.appContent && this.tabBrowser) {
+    this.appContent = this.tabBrowser.parentNode;
+  }
+
-  // update visual status when enabled state changes
-  this.enabledWatcher = GM_hitch(this, "refreshStatus");
-  GM_prefRoot.watch("enabled", this.enabledWatcher);
@@ -74 +80 @@
-                          .getService(Components.interfaces.nsIWindowWatcher);
-
-  // this gives us onLocationChange
-document.getElementById("content")
+this.tabBrowser
-    Components.interfaces.nsIWebProgress.NOTIFY_LOCATION);
-
-  // update enabled icon
@@ -107 +113 @@
- */
-GM_BrowserUI.openInTab = function(domWindow, url) {
-  if (this.isMyWindow(domWindow)) {
-document.getElementById("content")
+this.tabBrowser
-  }
-}
-

trunk/src/chrome/chromeFiles/content/browser.xul

@@ -62 +62 @@
-        <statusbarpanel id="gm-status" insertafter="livemark-button">
-            <label id="gm-status-label" collapsed="true" crop="end" style="width:0px; margin:0;" />
-            <image id="gm-status-image" width="16" height="16" style="margin:0 5px"
+              mousethrough="never"
-              onclick="if (!event.button) GM_setEnabled(!GM_getEnabled());
-                       else if (event.button == 1) GM_BrowserUI.manageMenuItemClicked();"
-              context='gm-status-popup'/>

trunk/src/install.rdf

@@ -7 +7 @@
-
-    <em:name>Greasemonkey</em:name>
-    <em:id>{e4a8a97b-f2ed-450b-b12d-ee082ba24781}</em:id>
-0607
+1101
-    <em:description>A User Script Manager for Firefox</em:description>
-    <em:creator>Aaron Boodman; http://youngpup.net/</em:creator>
-    <em:contributor>Anthony Lieuallen; http://arantius.com</em:contributor>
@@ -30 +30 @@
-    <em:optionsURL>chrome://greasemonkey/content/manage.xul</em:optionsURL>
-    <em:iconURL>chrome://greasemonkey/content/status_on.gif</em:iconURL>
-
+    <!-- Firefox -->
-    <em:targetApplication>
-      <Description>
-        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
@@ -38 +39 @@
-      </Description>
-    </em:targetApplication>
-
+    <!-- Songbird --> 
+    <em:targetApplication>
+      <Description>
+        <em:id>songbird@songbirdnest.com</em:id>
+        <em:minVersion>0.3pre</em:minVersion>
+        <em:maxVersion>0.3.*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
-    <em:file>
-      <Description about="urn:mozilla:extension:file:greasemonkey">
-        <em:package>content/</em:package>