Index: jar.mn =================================================================== RCS file: /cvsroot/mozilla/extensions/irc/jar.mn,v retrieving revision 1.37 retrieving revision 1.38 diff -d -p -u -6 -r1.37 -r1.38 --- jar.mn 21 Dec 2007 15:28:11 -0000 1.37 +++ jar.mn 2 Mar 2008 12:15:43 -0000 1.38 @@ -1,14 +1,16 @@ chatzilla.jar: % 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://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/preftree.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) Index: locales/en-US/chrome/chatzilla.properties =================================================================== RCS file: /cvsroot/mozilla/extensions/irc/locales/en-US/chrome/chatzilla.properties,v retrieving revision 1.154 retrieving revision 1.155 diff -d -p -u -6 -r1.154 -r1.155 --- locales/en-US/chrome/chatzilla.properties 16 Feb 2008 15:56:34 -0000 1.154 +++ locales/en-US/chrome/chatzilla.properties 2 Mar 2008 12:24:13 -0000 1.155 @@ -377,12 +377,15 @@ cmd.hide-view.help = Drop the current cmd.homepage.label = ChatZilla Homepage cmd.hop.label = Give Half-operator Status cmd.hop.params = [<...>] cmd.hop.help = Gives half-operator status to on current channel. Requires operator status. +cmd.idle-away.help = Internal command used for automatically setting "away" status when idle. +cmd.idle-back.help = Internal command used for automatically setting "back" status when returning from idle. + cmd.reconnect.format = Reconnect To $networkName cmd.reconnect.label = &Reconnect cmd.reconnect.params = [] cmd.reconnect.help = Reconnects to the network represented by the active view when the command is executed providing the reason when disconnecting, or the default reason if is not specified. cmd.reconnect-all.label = &Reconnect To All Networks Index: locales/generic/install.rdf =================================================================== RCS file: /cvsroot/mozilla/extensions/irc/locales/generic/install.rdf,v retrieving revision 1.2 retrieving revision 1.3 diff -d -p -u -6 -r1.2 -r1.3 --- locales/generic/install.rdf 22 Dec 2007 01:02:22 -0000 1.2 +++ locales/generic/install.rdf 2 Mar 2008 12:15:43 -0000 1.3 @@ -65,12 +65,21 @@ {3db10fab-e461-4c80-8b97-957ad5f8ea47} 9.0b1 9.0.* + + + + songbird@songbirdnest.com + 0.5pre + 0.5.* + + + locale/@AB_CD@/chatzilla/ Index: xpi/resources/install.rdf =================================================================== RCS file: /cvsroot/mozilla/extensions/irc/xpi/resources/install.rdf,v retrieving revision 1.14 retrieving revision 1.15 diff -d -p -u -6 -r1.14 -r1.15 --- xpi/resources/install.rdf 28 Oct 2007 19:19:26 -0000 1.14 +++ xpi/resources/install.rdf 2 Mar 2008 12:15:43 -0000 1.15 @@ -48,12 +48,21 @@ {3db10fab-e461-4c80-8b97-957ad5f8ea47} 9.0b1 9.0.* + + + + songbird@songbirdnest.com + 0.5pre + 0.5.* + + + ChatZilla A clean, easy to use and highly extensible Internet Relay Chat (IRC) client. The ChatZilla Team Lim Chee Aun (graphics) Robert Ginda Index: xul/content/commands.js =================================================================== RCS file: /cvsroot/mozilla/extensions/irc/xul/content/commands.js,v retrieving revision 1.148 retrieving revision 1.149 diff -d -p -u -6 -r1.148 -r1.149 --- xul/content/commands.js 15 Feb 2008 22:01:58 -0000 1.148 +++ xul/content/commands.js 2 Mar 2008 12:15:43 -0000 1.149 @@ -2309,13 +2309,16 @@ function cmdGotoURL(e) "nsIExternalProtocolService"); extProtoSvc.loadUrl(uri); dispatch("focus-input"); return; } - var window = getWindowByType("navigator:browser"); + if (client.host == "Songbird") + var window = getWindowByType("Songbird:Main"); + else + window = getWindowByType("navigator:browser"); if (!window) { openTopWin(e.url); dispatch("focus-input"); return; Index: xul/content/contents.rdf =================================================================== RCS file: /cvsroot/mozilla/extensions/irc/xul/content/contents.rdf,v retrieving revision 1.34 retrieving revision 1.35 diff -d -p -u -6 -r1.34 -r1.35 --- xul/content/contents.rdf 16 Feb 2008 15:56:34 -0000 1.34 +++ xul/content/contents.rdf 2 Mar 2008 12:15:44 -0000 1.35 @@ -18,22 +18,27 @@ 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 Index: xul/content/prefs.js =================================================================== RCS file: /cvsroot/mozilla/extensions/irc/xul/content/prefs.js,v retrieving revision 1.49 retrieving revision 1.50 diff -d -p -u -6 -r1.49 -r1.50 --- xul/content/prefs.js 20 Jan 2008 09:44:31 -0000 1.49 +++ xul/content/prefs.js 2 Mar 2008 12:15:44 -0000 1.50 @@ -89,12 +89,18 @@ function initPrefs() "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", "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) { Index: xul/content/static.js =================================================================== RCS file: /cvsroot/mozilla/extensions/irc/xul/content/static.js,v retrieving revision 1.267 retrieving revision 1.268 diff -d -p -u -6 -r1.267 -r1.268 --- xul/content/static.js 16 Feb 2008 15:56:34 -0000 1.267 +++ xul/content/static.js 2 Mar 2008 12:15:44 -0000 1.268 @@ -436,12 +436,15 @@ function initApplicationCompatibility() 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) Index: xul/skin/contents.rdf =================================================================== RCS file: /cvsroot/mozilla/extensions/irc/xul/skin/contents.rdf,v retrieving revision 1.2 retrieving revision 1.3 diff -d -p -u -6 -r1.2 -r1.3 --- xul/skin/contents.rdf 6 Dec 2003 00:27:12 -0000 1.2 +++ xul/skin/contents.rdf 2 Mar 2008 12:15:44 -0000 1.3 @@ -25,10 +25,14 @@ chrome://chatzilla/skin/browserOverlay.css + + chrome://chatzilla/skin/browserOverlay.css + + chrome://chatzilla/skin/browserOverlay.css