Index: jar.mn
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/jar.mn,v
retrieving revision 1.38
retrieving revision 1.39
diff -d -p -u -6 -r1.38 -r1.39
--- jar.mn	2 Mar 2008 12:15:43 -0000	1.38
+++ jar.mn	1 May 2008 18:33:13 -0000	1.39
@@ -1,13 +1,13 @@
 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/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)
@@ -46,12 +46,13 @@ chatzilla.jar:
 	content/chatzilla/output-base.css            (xul/content/output-base.css)
 	content/chatzilla/chatzillaOverlay.xul       (xul/content/chatzillaOverlay.xul) 
 	content/chatzilla/chatzillaOverlay.js        (xul/content/chatzillaOverlay.js)
 	content/chatzilla/browserOverlay.xul         (xul/content/browserOverlay.xul) 
 	content/chatzilla/prefsOverlay.xul           (xul/content/prefsOverlay.xul)
 	content/chatzilla/pref-irc.xul               (xul/content/pref-irc.xul)
+	content/chatzilla/pref-irc-toolkit.xul       (xul/content/pref-irc-toolkit.xul)
 	content/chatzilla/config.xul                 (xul/content/config.xul)
 	content/chatzilla/config-add.xul             (xul/content/config-add.xul)
 	content/chatzilla/config.js                  (xul/content/config.js)
 	content/chatzilla/config-add.js              (xul/content/config-add.js)
 	content/chatzilla/config.css                 (xul/content/config.css)
 	skin/modern/chatzilla/chatzilla.css          (xul/skin/chatzilla.css)
Index: xul/content/pref-irc-toolkit.xul
===================================================================
RCS file: xul/content/pref-irc-toolkit.xul
diff -N xul/content/pref-irc-toolkit.xul
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ xul/content/pref-irc-toolkit.xul	1 May 2008 18:33:13 -0000	1.1
@@ -0,0 +1,57 @@
+<?xml version="1.0"?> 
+
+<!-- ***** BEGIN LICENSE BLOCK *****
+   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
+   -
+   - The contents of this file are subject to the Mozilla 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/MPL/
+   -
+   - 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 Chatzilla.
+   -
+   - The Initial Developer of the Original Code is James Ross.
+   - Portions created by the Initial Developer are Copyright (C) 2004
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   James Ross, <silver@warwickcompsoc.co.uk>, original author
+   -   Robert Kaiser <kairo@kairo.at>
+   -
+   - Alternatively, the contents of this file may be used under the terms of
+   - either the GNU General Public License Version 2 or later (the "GPL"), or
+   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+   - in which case the provisions of the GPL or the LGPL are applicable instead
+   - of those above. If you wish to allow use of your version of this file only
+   - under the terms of either the GPL or the LGPL, and not to allow others to
+   - use your version of this file under the terms of the MPL, indicate your
+   - decision by deleting the provisions above and replace them with the notice
+   - and other provisions required by the GPL or the LGPL. If you do not delete
+   - the provisions above, a recipient may use your version of this file under
+   - the terms of any one of the MPL, the GPL or the LGPL.
+   -
+   - ***** END LICENSE BLOCK ***** -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<!DOCTYPE overlay SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
+
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <prefpane id="chatzilla_pane"
+            label="&pref-irc.window.title;">
+
+    <label>&pref-irc.open.desc;</label>
+    <separator/>
+    <hbox pack="center">
+      <button label="&pref-irc.open.label;" accesskey="&pref-irc.open.accesskey;"
+              oncommand="this.disabled = true;
+                         window.openDialog('chrome://chatzilla/content/config.xul',
+                                           '', 'chrome,modal,resizable');
+                         this.disabled = false;"/>
+    </hbox>
+  </prefpane>
+</overlay>
Index: xul/content/prefsOverlay.xul
===================================================================
RCS file: /cvsroot/mozilla/extensions/irc/xul/content/prefsOverlay.xul,v
retrieving revision 1.9
retrieving revision 1.10
diff -d -p -u -6 -r1.9 -r1.10
--- xul/content/prefsOverlay.xul	9 Dec 2005 14:18:42 -0000	1.9
+++ xul/content/prefsOverlay.xul	1 May 2008 18:33:13 -0000	1.10
@@ -18,12 +18,13 @@
    - The Initial Developer of the Original Code is James Ross.
    - Portions created by the Initial Developer are Copyright (C) 2004
    - the Initial Developer. All Rights Reserved.
    -
    - Contributor(s):
    -   James Ross, <silver@warwickcompsoc.co.uk>, original author
+   -   Robert Kaiser <kairo@kairo.at>
    -
    - Alternatively, the contents of this file may be used under the terms of
    - either the GNU General Public License Version 2 or later (the "GPL"), or
    - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
    - in which case the provisions of the GPL or the LGPL are applicable instead
    - of those above. If you wish to allow use of your version of this file only
@@ -37,33 +38,48 @@
    - ***** END LICENSE BLOCK ***** -->
    
 <!DOCTYPE overlay SYSTEM "chrome://chatzilla/locale/pref-irc.dtd">
 
 <overlay id="ovCZPrefs" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <!-- Tree entry -->
+  <!-- Tree entry (Mozilla/SeaMonkey 1.x) -->
   <treechildren id="panelChildren">
     <treeitem container="false" id="chatzillaItem" insertbefore="advancedItem">
       <treerow>
         <treecell url="chrome://chatzilla/content/pref-irc.xul" 
             label="&pref-irc.window.title;"/>
       </treerow>
     </treeitem>
   </treechildren>
+  <!-- Tree entry (SeaMonkey 2) -->
+  <treechildren id="prefsPanelChildren">
+    <treeitem id="chatzillaItem"
+              insertafter="editor,mailnews,navigator"
+              label="&pref-irc.window.title;"
+              prefpane="chatzilla_pane"
+              url="chrome://chatzilla/content/pref-irc-toolkit.xul"/>
+  </treechildren>
 
-  <!-- Startup option -->
+  <!-- Startup code (Mozilla/SeaMonkey 1.x) -->
   <script type="application/x-javascript">
     <![CDATA[
         var panel;
         if (panel != undefined && 
             (panel == "chrome://communicator/content/pref/pref-appearance.xul"))
             _elementIDs.push("generalStartupChat");
     ]]>
   </script>
+  <!-- Startup preference (SeaMonkey 2) -->
+  <preferences id="appearance_preferences">
+    <preference id="general.startup.chat"
+                name="general.startup.chat"
+                type="bool"/>
+  </preferences>
+  <!-- Startup checkbox -->
   <groupbox id="generalStartupPreferences">
     <checkbox id="generalStartupChat" label="&startup.chat.label;"
               accesskey="&startup.chat.accesskey;" pref="true" preftype="bool"
               prefstring="general.startup.chat" prefattribute="checked"
-              wsm_persist="true"/>
+              wsm_persist="true" preference="general.startup.chat"/>
   </groupbox>
 </overlay>