From 60f5a240844fb222c0777f6064bda241f8467633 Mon Sep 17 00:00:00 2001 From: "rginda%netscape.com" Date: Thu, 24 Feb 2000 03:38:05 +0000 Subject: [PATCH] Created irc menu item overlays under extensions/irc, in preparation for bug 28192 s fix. r=mcafee, a=jar --- extensions/irc/Makefile.in | 2 ++ extensions/irc/js/lib/connection-rhino.js | 2 +- extensions/irc/makefile.win | 2 ++ extensions/irc/xul/content/MANIFEST | 2 ++ extensions/irc/xul/content/Makefile.in | 10 ++++-- .../irc/xul/content/chatzillaOverlay.js | 7 ++++ .../irc/xul/content/chatzillaOverlay.xul | 20 +++++++++++ extensions/irc/xul/locale/Makefile.in | 1 - extensions/irc/xul/locale/en-US/MANIFEST | 2 ++ extensions/irc/xul/locale/en-US/Makefile.in | 9 +++-- .../irc/xul/locale/en-US/chatzillaOverlay.dtd | 1 + extensions/irc/xul/locale/en-US/makfile.win | 36 +++++++++++++++++++ extensions/irc/xul/locale/makefile.win | 26 ++++++++++++++ extensions/irc/xul/makefile.win | 26 ++++++++++++++ 14 files changed, 140 insertions(+), 6 deletions(-) create mode 100644 extensions/irc/xul/content/chatzillaOverlay.js create mode 100644 extensions/irc/xul/content/chatzillaOverlay.xul create mode 100644 extensions/irc/xul/locale/en-US/MANIFEST create mode 100644 extensions/irc/xul/locale/en-US/chatzillaOverlay.dtd create mode 100644 extensions/irc/xul/locale/en-US/makfile.win create mode 100644 extensions/irc/xul/locale/makefile.win create mode 100644 extensions/irc/xul/makefile.win diff --git a/extensions/irc/Makefile.in b/extensions/irc/Makefile.in index 98d545a9f6c4..ba149c119f00 100644 --- a/extensions/irc/Makefile.in +++ b/extensions/irc/Makefile.in @@ -34,6 +34,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +DIRS = xul + JSLIBFILES = \ $(srcdir)/js/lib/utils.js \ $(srcdir)/js/lib/events.js \ diff --git a/extensions/irc/js/lib/connection-rhino.js b/extensions/irc/js/lib/connection-rhino.js index b2682a70c793..9ae9f8f12a06 100755 --- a/extensions/irc/js/lib/connection-rhino.js +++ b/extensions/irc/js/lib/connection-rhino.js @@ -113,7 +113,7 @@ CBSConnection.prototype.readData = function(timeout) var len = this._inputStream.read(this._buffer); // dd ("read done, len = " + len + ", buffer = " + this._buffer); - rv = new java.lang.String(this._buffer, 0, 0, len); + rv = String(new java.lang.String(this._buffer, 0, 0, len)); } catch (ex) { // dd ("read caught exception " + ex + "."); diff --git a/extensions/irc/makefile.win b/extensions/irc/makefile.win index 28ada092f823..706162e2b1ce 100644 --- a/extensions/irc/makefile.win +++ b/extensions/irc/makefile.win @@ -31,6 +31,8 @@ DEPTH =..\.. +DIRS = xul + JSLIBFILES = \ .\js\lib\utils.js \ .\js\lib\events.js \ diff --git a/extensions/irc/xul/content/MANIFEST b/extensions/irc/xul/content/MANIFEST index 6e56133e8cf2..fc71aae86d6b 100644 --- a/extensions/irc/xul/content/MANIFEST +++ b/extensions/irc/xul/content/MANIFEST @@ -1,4 +1,6 @@ chatzilla.xul +chatzillaOverlay.xul +chatzillaOverlay.js commands.js handlers.js readprefs.js diff --git a/extensions/irc/xul/content/Makefile.in b/extensions/irc/xul/content/Makefile.in index a980b53556fa..24687a496e89 100644 --- a/extensions/irc/xul/content/Makefile.in +++ b/extensions/irc/xul/content/Makefile.in @@ -26,11 +26,17 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_RESOURCE_CONTENT = \ +EXPORT_PREF_CONTENT = \ $(srcdir)/pref-irc.xul \ $(NULL) +EXPORT_RESOURCE_CONTENT = \ + $(srcdir)/chatzillaOverlay.xul \ + $(srcdir)/chatzillaOverlay.js \ + $(NULL) + include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/pref/content/default + $(INSTALL) $(EXPORT_PREF_CONTENT) $(DIST)/bin/chrome/pref/content/default + $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/chatzilla/content/default diff --git a/extensions/irc/xul/content/chatzillaOverlay.js b/extensions/irc/xul/content/chatzillaOverlay.js new file mode 100644 index 000000000000..8a6bb127c8a9 --- /dev/null +++ b/extensions/irc/xul/content/chatzillaOverlay.js @@ -0,0 +1,7 @@ +function toIRC() +{ + + toOpenWindowByType("irc:chatzilla", "chrome://chatzilla/content/"); + +} + diff --git a/extensions/irc/xul/content/chatzillaOverlay.xul b/extensions/irc/xul/content/chatzillaOverlay.xul new file mode 100644 index 000000000000..7e0172218c61 --- /dev/null +++ b/extensions/irc/xul/content/chatzillaOverlay.xul @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + diff --git a/extensions/irc/xul/locale/Makefile.in b/extensions/irc/xul/locale/Makefile.in index 6efeede4d64d..033c8069594f 100644 --- a/extensions/irc/xul/locale/Makefile.in +++ b/extensions/irc/xul/locale/Makefile.in @@ -29,4 +29,3 @@ include $(DEPTH)/config/autoconf.mk DIRS = en-US include $(topsrcdir)/config/rules.mk - diff --git a/extensions/irc/xul/locale/en-US/MANIFEST b/extensions/irc/xul/locale/en-US/MANIFEST new file mode 100644 index 000000000000..8b0f09d35b9a --- /dev/null +++ b/extensions/irc/xul/locale/en-US/MANIFEST @@ -0,0 +1,2 @@ +pref-irc.dtd +chatzillaOverlay.dtd diff --git a/extensions/irc/xul/locale/en-US/Makefile.in b/extensions/irc/xul/locale/en-US/Makefile.in index cba98f740da0..b7f027c334a8 100644 --- a/extensions/irc/xul/locale/en-US/Makefile.in +++ b/extensions/irc/xul/locale/en-US/Makefile.in @@ -26,11 +26,16 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -EXPORT_RESOURCE_CONTENT = \ +EXPORT_PREF_CONTENT = \ $(srcdir)/pref-irc.dtd \ $(NULL) +EXPORT_RESOURCE_CONTENT = \ + $(srcdir)/chatzillaOverlay.dtd \ + $(NULL) + include $(topsrcdir)/config/rules.mk install:: - $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/pref/locale/en-US + $(INSTALL) $(EXPORT_PREF_CONTENT) $(DIST)/bin/chrome/pref/locale/en-US + $(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/chatzilla/locale/en-US diff --git a/extensions/irc/xul/locale/en-US/chatzillaOverlay.dtd b/extensions/irc/xul/locale/en-US/chatzillaOverlay.dtd new file mode 100644 index 000000000000..581783856e56 --- /dev/null +++ b/extensions/irc/xul/locale/en-US/chatzillaOverlay.dtd @@ -0,0 +1 @@ + diff --git a/extensions/irc/xul/locale/en-US/makfile.win b/extensions/irc/xul/locale/en-US/makfile.win new file mode 100644 index 000000000000..cdc9154a085a --- /dev/null +++ b/extensions/irc/xul/locale/en-US/makfile.win @@ -0,0 +1,36 @@ +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +DEPTH = ../../../../.. + +EXPORT_PREF_CONTENT = \ + .\pref-irc.dtd \ + $(NULL) + +EXPORT_RESOURCE_CONTENT = \ + .\chatzillaOverlay.dtd \ + $(NULL) + +include <$(DEPTH)\config\rules.mk> + +install:: + $(MAKE_INSTALL) $(EXPORT_PREF_CONTENT) $(DIST)\bin\chrome\pref\locale\en-US + $(MAKE_INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)\bin\chrome\chatzilla\locale/en-US diff --git a/extensions/irc/xul/locale/makefile.win b/extensions/irc/xul/locale/makefile.win new file mode 100644 index 000000000000..94c001d3648b --- /dev/null +++ b/extensions/irc/xul/locale/makefile.win @@ -0,0 +1,26 @@ +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +DEPTH = ..\..\..\.. + +DIRS = en-US + +include <$(DEPTH)\config\rules.mk> \ No newline at end of file diff --git a/extensions/irc/xul/makefile.win b/extensions/irc/xul/makefile.win new file mode 100644 index 000000000000..36ba6950ebb7 --- /dev/null +++ b/extensions/irc/xul/makefile.win @@ -0,0 +1,26 @@ +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +DEPTH = ..\..\.. + +DIRS = content locale + +include <$(DEPTH)\config\rules.mk>