diff --git a/jar.mn b/jar.mn
--- a/jar.mn
+++ b/jar.mn
@@ -9,22 +9,20 @@ chatzilla.jar:
% contract @mozilla.org/network/protocol;1?name=ircs {f21c35f4-1dd1-11b2-a503-9bf8a539ea39}
% contract @mozilla.org/commandlinehandler/general-startup;1?type=chat {38a95514-1dd2-11b2-97e7-9da958640f2c}
% category command-line-handler m-irc @mozilla.org/commandlinehandler/general-startup;1?type=chat
% content chatzilla %content/chatzilla/
% skin chatzilla modern/1.0 %skin/modern/chatzilla/
% overlay chrome://browser/content/browser.xul chrome://chatzilla/content/browserOverlay.xul application={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
% overlay chrome://browser/content/browser.xul chrome://chatzilla/content/browserOverlay.xul application={a463f10c-3994-11da-9945-000d60ca027b}
% overlay chrome://navigator/content/navigator.xul chrome://chatzilla/content/browserOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
-% overlay chrome://songbird/content/xul/layoutBaseOverlay.xul chrome://chatzilla/content/browserOverlay.xul application=songbird@songbirdnest.com
% overlay chrome://editor/content/editorTasksOverlay.xul chrome://chatzilla/content/chatzillaOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
% overlay chrome://communicator/content/pref/preferences.xul chrome://chatzilla/content/prefsOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
% overlay chrome://communicator/content/pref/pref-appearance.xul chrome://chatzilla/content/prefsOverlay.xul application={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
% style chrome://browser/content/browser.xul chrome://chatzilla/skin/browserOverlay.css
-% style chrome://songbird/content/xul/layoutBaseOverlay.xul chrome://chatzilla/skin/browserOverlay.css
% style chrome://global/content/customizeToolbar.xul chrome://chatzilla/skin/browserOverlay.css
* content/chatzilla/contents.rdf (xul/content/contents.rdf)
skin/modern/chatzilla/contents.rdf (xul/skin/contents.rdf)
content/chatzilla/lib/js/utils.js (js/lib/utils.js)
content/chatzilla/lib/js/events.js (js/lib/events.js)
content/chatzilla/lib/js/connection-xpcom.js (js/lib/connection-xpcom.js)
content/chatzilla/lib/js/command-manager.js (js/lib/command-manager.js)
content/chatzilla/lib/js/pref-manager.js (js/lib/pref-manager.js)
diff --git a/locales/generic/install.rdf b/locales/generic/install.rdf
--- a/locales/generic/install.rdf
+++ b/locales/generic/install.rdf
@@ -58,27 +58,16 @@
2.x is Gecko (x+3).0, where x is greater than 2 -->
{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
2.0
2.20a1
-
-
-
-
- songbird@songbirdnest.com
- 1.9
- 1.10.*
-
-
locale/@AB_CD@/chatzilla/
diff --git a/xpi/resources/install.rdf b/xpi/resources/install.rdf
--- a/xpi/resources/install.rdf
+++ b/xpi/resources/install.rdf
@@ -41,27 +41,16 @@
2.x is Gecko (x+3).0, where x is greater than 2 -->
{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
2.0
2.32.*
-
-
-
-
- songbird@songbirdnest.com
- 1.9
- 1.10.*
-
-
ChatZilla
A clean, easy to use and highly extensible Internet Relay Chat (IRC) client.
The ChatZilla Team
Lim Chee Aun (graphics)
Robert Ginda
diff --git a/xul/content/commands.js b/xul/content/commands.js
--- a/xul/content/commands.js
+++ b/xul/content/commands.js
@@ -2219,23 +2219,17 @@ function cmdGotoURL(e)
{
const extProtoSvc = getService(EXT_PROTO_SVC,
"nsIExternalProtocolService");
extProtoSvc.loadUrl(uri);
dispatch("focus-input");
return;
}
- var browserWin;
-
- if (client.host == "Songbird")
- browserWin = getWindowByType("Songbird:Main");
- else
- browserWin = getWindowByType("navigator:browser");
-
+ var browserWin = getWindowByType("navigator:browser");
var location = browserWin ? browserWin.gBrowser.currentURI.spec : null;
var action = e.command.name;
// We don't want to replace ChatZilla running in a tab.
if ((action == "goto-url-newwin") ||
((action == "goto-url-newtab") && !browserWin) ||
((action == "goto-url") && !browserWin) ||
((action == "goto-url") && browserWin &&
diff --git a/xul/content/contents.rdf b/xul/content/contents.rdf
--- a/xul/content/contents.rdf
+++ b/xul/content/contents.rdf
@@ -21,30 +21,25 @@
chrome:extension="true"
chrome:settingsURL="chrome://chatzilla/content/config.xul"
chrome:name="chatzilla">
-
chrome://chatzilla/content/browserOverlay.xul
-
- chrome://chatzilla/content/browserOverlay.xul
-
-
chrome://chatzilla/content/chatzillaOverlay.xul
chrome://chatzilla/content/prefsOverlay.xul
diff --git a/xul/content/prefs.js b/xul/content/prefs.js
--- a/xul/content/prefs.js
+++ b/xul/content/prefs.js
@@ -53,22 +53,16 @@ function initPrefs()
var gotos = ["goto-url-newtab", "goto-url-newwin",
"goto-url-newtab", "goto-url-newtab"];
if (client.host == "XULRunner")
{
gotos = ["goto-url-external", "goto-url-external",
"goto-url-external", "goto-url-external"];
}
- else if (client.host == "Songbird")
- {
- // Songbird has a browser, but only supports a single browser window
- gotos = ["goto-url-newtab", "goto-url-newtab",
- "goto-url-newtab", "goto-url-newtab"];
- }
// Set up default nickname, if possible.
var defaultNick = DEFAULT_NICK;
var en = getService("@mozilla.org/process/environment;1", "nsIEnvironment");
if (en)
{
/* Get the enviroment variables used by various OSes:
* USER - Linux, Mac OSX and other *nix-types.
diff --git a/xul/content/static.js b/xul/content/static.js
--- a/xul/content/static.js
+++ b/xul/content/static.js
@@ -517,19 +517,16 @@ function initApplicationCompatibility()
client.host = "Mozilla";
break;
case "{a463f10c-3994-11da-9945-000d60ca027b}": // Flock
client.host = "Flock";
break;
case "{3db10fab-e461-4c80-8b97-957ad5f8ea47}": // Netscape
client.host = "Netscape";
break;
- case "songbird@songbirdnest.com": // Songbird
- client.host = "Songbird";
- break;
default:
client.unknownUID = app.ID;
client.host = ""; // Unknown host, show an error later.
}
}
else if ("getBrowserURL" in window)
{
var url = getBrowserURL();
diff --git a/xul/skin/contents.rdf b/xul/skin/contents.rdf
--- a/xul/skin/contents.rdf
+++ b/xul/skin/contents.rdf
@@ -27,16 +27,12 @@
chrome://chatzilla/skin/browserOverlay.css
-
- chrome://chatzilla/skin/browserOverlay.css
-
-
chrome://chatzilla/skin/browserOverlay.css