Index: trunk/src/chrome.manifest
===============================================================
--- trunk/src/chrome.manifest   (revision 491)
+++ trunk/src/chrome.manifest   (working copy)
@@ -1,3 +1,4 @@
 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/
Index: trunk/src/chrome/chromeFiles/content/browser.js
===============================================================
--- trunk/src/chrome/chromeFiles/content/browser.js     (revision 491)
+++ trunk/src/chrome/chromeFiles/content/browser.js     (working copy)
@@ -11,7 +11,8 @@ var GM_BrowserUI = new Object();
 GM_BrowserUI.QueryInterface = function(aIID) {
   if (!aIID.equals(Components.interfaces.nsISupports) &&
       !aIID.equals(Components.interfaces.gmIBrowserWindow) &&
-      !aIID.equals(Components.interfaces.nsISupportsWeakReference))
+      !aIID.equals(Components.interfaces.nsISupportsWeakReference) &&
+      !aIID.equals(Components.interfaces.nsIWebProgressListener))
     throw Components.results.NS_ERROR_NO_INTERFACE;

   return this;
@@ -55,6 +56,14 @@ GM_BrowserUI.chromeLoad = function(e) {
     this.toolsMenu = document.getElementById("taskPopup");
   }

+  // songbird compat
+  if (!this.tabBrowser && window.gBrowser) {
+    this.tabBrowser = window.gBrowser;
+  }
+  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);
@@ -73,8 +82,9 @@ GM_BrowserUI.chromeLoad = function(e) {
   this.winWat = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
                           .getService(Components.interfaces.nsIWindowWatcher);

+  // we use this to determine if we are the active window sometimes
   // this gives us onLocationChange
-  document.getElementById("content").addProgressListener(this,
+  this.tabBrowser.addProgressListener(this,
     Components.interfaces.nsIWebProgress.NOTIFY_LOCATION);

   // update enabled icon
@@ -107,7 +117,7 @@ GM_BrowserUI.registerMenuCommand = function(menuCommand) {
  */
 GM_BrowserUI.openInTab = function(domWindow, url) {
   if (this.isMyWindow(domWindow)) {
-    document.getElementById("content").addTab(url);
+    this.tabBrowser.addTab(url);
   }
 }

Index: trunk/src/chrome/chromeFiles/content/browser.xul
===============================================================
--- trunk/src/chrome/chromeFiles/content/browser.xul    (revision 491)
+++ trunk/src/chrome/chromeFiles/content/browser.xul    (working copy)
@@ -62,6 +62,7 @@
         
             
             
Index: trunk/src/install.rdf
===============================================================
--- trunk/src/install.rdf       (revision 491)
+++ trunk/src/install.rdf       (working copy)
@@ -30,6 +30,7 @@
     chrome://greasemonkey/content/manage.xul
     chrome://greasemonkey/content/status_on.gif

+    
     
       
         {ec8030f7-c20a-464f-9b0e-13a3a9e97384}
@@ -38,6 +39,15 @@
       
     

+     
+    
+      
+        songbird@songbirdnest.com
+        0.3pre
+        0.3
+      
+    
+
     
       
         content/