Bug 954193 - create a chat/ folder to contain the core code that isn't related to libpurple.
authorFlorian Quèze <florian@instantbird.org>
Sat, 29 Oct 2011 02:17:05 +0200
changeset 18433 9d0c3d6cdf63063b630180d701e0e3a9ea227059
parent 18432 3534126430dbe6a51d87c10804b2fc9d71cdf70d
child 18434 466e354185cf4e97d5604c3403b3205f2d389e57
push id1103
push usermbanner@mozilla.com
push dateTue, 18 Mar 2014 07:44:06 +0000
treeherdercomm-beta@50c6279a0af0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs954193
Bug 954193 - create a chat/ folder to contain the core code that isn't related to libpurple.
chat/Makefile.in
chat/components/public/Makefile.in
chat/components/public/ibILogger.idl
chat/components/public/imICommandsService.idl
chat/components/public/imIContactsService.idl
chat/components/public/imIConversationsService.idl
chat/components/public/purpleIConversation.idl
chat/components/src/Makefile.in
chat/components/src/imCommands.js
chat/components/src/imCommands.manifest
chat/components/src/imContacts.js
chat/components/src/imContacts.manifest
chat/components/src/imConversations.js
chat/components/src/imConversations.manifest
chat/components/src/logger.js
chat/components/src/logger.manifest
chat/components/src/smileProtocolHandler.js
chat/components/src/smileProtocolHandler.manifest
chat/content/Makefile.in
chat/content/browserRequest.js
chat/content/browserRequest.xul
chat/content/conv.html
chat/content/convbrowser.xml
chat/content/jar.mn
chat/locales/Makefile.in
chat/locales/en-US/commands.properties
chat/locales/en-US/conversations.properties
chat/locales/en-US/status.properties
chat/locales/en-US/twitter.properties
chat/locales/jar.mn
chat/makefiles.sh
chat/modules/Makefile.in
chat/modules/hiddenWindow.jsm
chat/modules/http.jsm
chat/modules/ibInterruptions.jsm
chat/modules/ibSounds.jsm
chat/modules/imContentSink.jsm
chat/modules/imServices.jsm
chat/modules/imSmileys.jsm
chat/modules/imStatusUtils.jsm
chat/modules/imTextboxUtils.jsm
chat/modules/imThemes.jsm
chat/modules/imXPCOMUtils.jsm
chat/modules/jsProtoHelper.jsm
chat/modules/socket.jsm
chat/protocols/jsTest/Makefile.in
chat/protocols/jsTest/jsTestProtocol.js
chat/protocols/jsTest/jsTestProtocol.manifest
chat/protocols/overrides/Makefile.in
chat/protocols/overrides/facebookOverrideProtocol.js
chat/protocols/overrides/gtalkOverrideProtocol.js
chat/protocols/overrides/icons/prpl-facebook-32.png
chat/protocols/overrides/icons/prpl-facebook-48.png
chat/protocols/overrides/icons/prpl-facebook.png
chat/protocols/overrides/icons/prpl-gtalk-32.png
chat/protocols/overrides/icons/prpl-gtalk-48.png
chat/protocols/overrides/icons/prpl-gtalk.png
chat/protocols/overrides/jar.mn
chat/protocols/overrides/overrideProtocols.manifest
chat/protocols/twitter/Makefile.in
chat/protocols/twitter/icons/prpl-twitter-32.png
chat/protocols/twitter/icons/prpl-twitter-48.png
chat/protocols/twitter/icons/prpl-twitter.png
chat/protocols/twitter/jar.mn
chat/protocols/twitter/twitter.js
chat/protocols/twitter/twitter.manifest
chat/themes/Makefile.in
chat/themes/browserRequest.css
chat/themes/icons/insecure.png
chat/themes/icons/prpl-generic-32.png
chat/themes/icons/prpl-generic-48.png
chat/themes/icons/prpl-generic.png
chat/themes/icons/prpl-unknown-32.png
chat/themes/icons/prpl-unknown-48.png
chat/themes/icons/prpl-unknown.png
chat/themes/icons/secure.png
chat/themes/jar.mn
im/build.mk
im/components/Makefile.in
im/components/ibILogger.idl
im/components/logger.js
im/components/logger.manifest
im/components/smileProtocolHandler.js
im/components/smileProtocolHandler.manifest
im/content/browserRequest.js
im/content/browserRequest.xul
im/content/conv.html
im/content/convbrowser.xml
im/content/jar.mn
im/installer/package-manifest.in
im/locales/Makefile.in
im/modules/Makefile.in
im/modules/hiddenWindow.jsm
im/modules/ibInterruptions.jsm
im/modules/ibSounds.jsm
im/modules/imContentSink.jsm
im/modules/imServices.jsm
im/modules/imSmileys.jsm
im/modules/imTextboxUtils.jsm
im/modules/imThemes.jsm
im/themes/browserRequest.css
im/themes/icons/insecure.png
im/themes/icons/secure.png
im/themes/jar.mn
purple/locales/en-US/commands.properties
purple/locales/en-US/conversations.properties
purple/locales/en-US/status.properties
purple/locales/en-US/twitter.properties
purple/purplexpcom/public/imICommandsService.idl
purple/purplexpcom/public/imIContactsService.idl
purple/purplexpcom/public/imIConversationsService.idl
purple/purplexpcom/public/purpleIConversation.idl
purple/purplexpcom/src/facebookOverrideProtocol.js
purple/purplexpcom/src/gtalkOverrideProtocol.js
purple/purplexpcom/src/http.jsm
purple/purplexpcom/src/imCommands.js
purple/purplexpcom/src/imCommands.manifest
purple/purplexpcom/src/imContacts.js
purple/purplexpcom/src/imContacts.manifest
purple/purplexpcom/src/imConversations.js
purple/purplexpcom/src/imConversations.manifest
purple/purplexpcom/src/imStatusUtils.jsm
purple/purplexpcom/src/imXPCOMUtils.jsm
purple/purplexpcom/src/jsProtoHelper.jsm
purple/purplexpcom/src/jsTestProtocol.js
purple/purplexpcom/src/jsTestProtocol.manifest
purple/purplexpcom/src/overrideProtocols.manifest
purple/purplexpcom/src/socket.jsm
purple/purplexpcom/src/twitter.js
purple/purplexpcom/src/twitter.manifest
new file mode 100644
--- /dev/null
+++ b/chat/Makefile.in
@@ -0,0 +1,60 @@
+# ***** 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+#   Florian QUEZE <florian@instantbird.org>
+# Portions created by the Initial Developer are Copyright (C) 2008
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of 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 *****
+
+DEPTH		= ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+PROTOCOLS = twitter overrides
+
+ifdef MOZ_DEBUG
+PROTOCOLS += jsTest
+endif
+
+PARALLEL_DIRS	= \
+		components/public \
+		components/src \
+		modules \
+		content \
+		themes \
+		locales \
+		$(foreach proto,$(PROTOCOLS),protocols/$(proto)) \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
new file mode 100644
--- /dev/null
+++ b/chat/components/public/Makefile.in
@@ -0,0 +1,54 @@
+# ***** 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of 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 *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= chat
+
+XPIDLSRCS	= \
+		ibILogger.idl \
+		imICommandsService.idl \
+		imIContactsService.idl \
+		imIConversationsService.idl \
+		purpleIConversation.idl \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
rename from im/components/ibILogger.idl
rename to chat/components/public/ibILogger.idl
rename from purple/purplexpcom/public/imICommandsService.idl
rename to chat/components/public/imICommandsService.idl
rename from purple/purplexpcom/public/imIContactsService.idl
rename to chat/components/public/imIContactsService.idl
rename from purple/purplexpcom/public/imIConversationsService.idl
rename to chat/components/public/imIConversationsService.idl
rename from purple/purplexpcom/public/purpleIConversation.idl
rename to chat/components/public/purpleIConversation.idl
new file mode 100644
--- /dev/null
+++ b/chat/components/src/Makefile.in
@@ -0,0 +1,56 @@
+# ***** 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of 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 *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+EXTRA_COMPONENTS = \
+		imContacts.js imContacts.manifest \
+		imConversations.js imConversations.manifest \
+		imCommands.js imCommands.manifest \
+		logger.manifest \
+		smileProtocolHandler.js smileProtocolHandler.manifest \
+		$(NULL)
+
+EXTRA_PP_COMPONENTS = \
+		logger.js \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
rename from purple/purplexpcom/src/imCommands.js
rename to chat/components/src/imCommands.js
rename from purple/purplexpcom/src/imCommands.manifest
rename to chat/components/src/imCommands.manifest
rename from purple/purplexpcom/src/imContacts.js
rename to chat/components/src/imContacts.js
rename from purple/purplexpcom/src/imContacts.manifest
rename to chat/components/src/imContacts.manifest
rename from purple/purplexpcom/src/imConversations.js
rename to chat/components/src/imConversations.js
rename from purple/purplexpcom/src/imConversations.manifest
rename to chat/components/src/imConversations.manifest
rename from im/components/logger.js
rename to chat/components/src/logger.js
rename from im/components/logger.manifest
rename to chat/components/src/logger.manifest
rename from im/components/smileProtocolHandler.js
rename to chat/components/src/smileProtocolHandler.js
rename from im/components/smileProtocolHandler.manifest
rename to chat/components/src/smileProtocolHandler.manifest
new file mode 100644
--- /dev/null
+++ b/chat/content/Makefile.in
@@ -0,0 +1,44 @@
+# ***** 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 the Mozilla Browser code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2002
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
rename from im/content/browserRequest.js
rename to chat/content/browserRequest.js
rename from im/content/browserRequest.xul
rename to chat/content/browserRequest.xul
new file mode 100644
rename from im/content/convbrowser.xml
rename to chat/content/convbrowser.xml
new file mode 100644
--- /dev/null
+++ b/chat/content/jar.mn
@@ -0,0 +1,6 @@
+instantbird.jar:
+% content instantbird %content/instantbird/
+	content/instantbird/browserRequest.js
+	content/instantbird/browserRequest.xul
+	content/instantbird/convbrowser.xml
+	content/instantbird/conv.html
new file mode 100644
--- /dev/null
+++ b/chat/locales/Makefile.in
@@ -0,0 +1,60 @@
+# ***** 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 the Mozilla Browser code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2002
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+ifeq (,$(filter-out en-US,$(AB_CD)))
+relativesrcdir  = chat/locales
+else
+relativesrcdir  = purple/locales
+endif
+
+DEFINES += \
+	-DAB_CD=$(AB_CD) \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+libs-%: AB_CD=$*
+libs-%:
+	# XXX: it would be nice if we could just do nothing if no langpack is being done
+	#  currently, we just go and (re)build en-US if called with a non-supported locale
+	$(MAKE) libs AB_CD=$*
rename from purple/locales/en-US/commands.properties
rename to chat/locales/en-US/commands.properties
rename from purple/locales/en-US/conversations.properties
rename to chat/locales/en-US/conversations.properties
rename from purple/locales/en-US/status.properties
rename to chat/locales/en-US/status.properties
rename from purple/locales/en-US/twitter.properties
rename to chat/locales/en-US/twitter.properties
new file mode 100644
--- /dev/null
+++ b/chat/locales/jar.mn
@@ -0,0 +1,8 @@
+#filter substitution
+
+@AB_CD@.jar:
+% locale purple @AB_CD@ %locale/@AB_CD@/purple/
+	locale/@AB_CD@/purple/commands.properties (%commands.properties)
+	locale/@AB_CD@/purple/conversations.properties (%conversations.properties)
+	locale/@AB_CD@/purple/status.properties (%status.properties)
+	locale/@AB_CD@/purple/twitter.properties	(%twitter.properties)
new file mode 100644
--- /dev/null
+++ b/chat/makefiles.sh
@@ -0,0 +1,48 @@
+# ***** 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 the Mozilla build system.
+#
+# The Initial Developer of the Original Code is
+#  Florian Queze <florian@instantbird.org>
+# Portions created by the Initial Developer are Copyright (C) 2008
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
+
+add_makefiles "
+chat/Makefile
+chat/components/public/Makefile
+chat/components/src/Makefile
+chat/content/Makefile
+chat/locales/Makefile
+chat/modules/Makefile
+chat/protocols/jsTest/Makefile
+chat/protocols/overrides/Makefile
+chat/protocols/twitter/Makefile
+chat/themes/Makefile
+"
new file mode 100644
--- /dev/null
+++ b/chat/modules/Makefile.in
@@ -0,0 +1,63 @@
+# ***** 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of 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 *****
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+EXTRA_JS_MODULES = \
+	http.jsm \
+	ibInterruptions.jsm \
+	ibSounds.jsm \
+	imContentSink.jsm \
+	imServices.jsm \
+	imSmileys.jsm \
+	imStatusUtils.jsm \
+	imXPCOMUtils.jsm \
+	jsProtoHelper.jsm \
+	socket.jsm \
+	$(NULL)
+
+EXTRA_PP_JS_MODULES = \
+	hiddenWindow.jsm \
+	imTextboxUtils.jsm \
+	imThemes.jsm \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
rename from im/modules/hiddenWindow.jsm
rename to chat/modules/hiddenWindow.jsm
rename from purple/purplexpcom/src/http.jsm
rename to chat/modules/http.jsm
rename from im/modules/ibInterruptions.jsm
rename to chat/modules/ibInterruptions.jsm
rename from im/modules/ibSounds.jsm
rename to chat/modules/ibSounds.jsm
rename from im/modules/imContentSink.jsm
rename to chat/modules/imContentSink.jsm
rename from im/modules/imServices.jsm
rename to chat/modules/imServices.jsm
rename from im/modules/imSmileys.jsm
rename to chat/modules/imSmileys.jsm
rename from purple/purplexpcom/src/imStatusUtils.jsm
rename to chat/modules/imStatusUtils.jsm
rename from im/modules/imTextboxUtils.jsm
rename to chat/modules/imTextboxUtils.jsm
rename from im/modules/imThemes.jsm
rename to chat/modules/imThemes.jsm
rename from purple/purplexpcom/src/imXPCOMUtils.jsm
rename to chat/modules/imXPCOMUtils.jsm
rename from purple/purplexpcom/src/jsProtoHelper.jsm
rename to chat/modules/jsProtoHelper.jsm
rename from purple/purplexpcom/src/socket.jsm
rename to chat/modules/socket.jsm
new file mode 100644
--- /dev/null
+++ b/chat/protocols/jsTest/Makefile.in
@@ -0,0 +1,48 @@
+# ***** 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of 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 *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+ifdef MOZ_DEBUG
+EXTRA_COMPONENTS += jsTestProtocol.js jsTestProtocol.manifest
+endif
+
+include $(topsrcdir)/config/rules.mk
rename from purple/purplexpcom/src/jsTestProtocol.js
rename to chat/protocols/jsTest/jsTestProtocol.js
rename from purple/purplexpcom/src/jsTestProtocol.manifest
rename to chat/protocols/jsTest/jsTestProtocol.manifest
new file mode 100644
--- /dev/null
+++ b/chat/protocols/overrides/Makefile.in
@@ -0,0 +1,50 @@
+# ***** 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of 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 *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+EXTRA_COMPONENTS = \
+		gtalkOverrideProtocol.js \
+		facebookOverrideProtocol.js \
+		overrideProtocols.manifest \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
rename from purple/purplexpcom/src/facebookOverrideProtocol.js
rename to chat/protocols/overrides/facebookOverrideProtocol.js
rename from purple/purplexpcom/src/gtalkOverrideProtocol.js
rename to chat/protocols/overrides/gtalkOverrideProtocol.js
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..77e6d358b62d50924610584a77442871038a9057
GIT binary patch
literal 1193
zc$@*L1XlZrP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iXJ>
z2{;vzQxf6;00b#XL_t(o!^M|RXdP7)#(($D%zMw5KTXp#Nn=~17(>-XP}Eiw6?IXI
z5Cow+7j9g*3)F=uZd?>`qiZ+rv<jt*>O!e*tP~XrT3Ss1rLCo=ttF|=yqSB?aq;H8
zCYhJa1Ri)F!*CBX_xtX5zH{b2_@9Sa9T?wxaJP-@j5<H9XxKd<<4hPFmQ+5z@Xb3v
zcO)>r_u%eIHTZsFa-z0l$C#~FA}XOJu!bnKgchuA&W!=ndRxIOcrSPX=LIi9>LGPP
zBlX0Ml)tWAmGiT+u}kH}7Ks%*w1J&@@S%y?z}8WF?%ER0-|3pvfi(;akJ@q7+POc^
z&H%6H2&lN}?e~t@3-d8)>bsh2=i%0(ux)I_o;`DBx)onZ0K!TXk*0T0aitgc0{!)f
zH(q{#rzW?sV{09g<wsRnN<91CJBD*1l_)}&;pR*h8b!sSs-+1G_C|dD{&NJ@<jrRc
z^=jB$PaL6@m3XUPuvQQeP$^B|t$hy@Sc9szcfNY4c+^;;RV4ESO!HwVufXnI!|mNd
z)A^qqKE*F*=IN_PJpITBssgHnmI4Azx+PPfM1f_Xx3VI7=*M#$`r#}=U_jyI>~$(p
zfH8)^==ubV3L@nyKtvhYd`~WZdHyzGklETm6dF_oRj@@0U?fXH@%ZV}*V;~Bp8Es)
zr#P^Gsy%=6qhp+&`zPxM1twJ0X1+GkX4f#@U8Ve*Yvu`vpt3On>$(4~u_g0Zfd@pI
zDJa?%z_V|E$=Fa2Uwp7{Mf~$`Px0B&Kicyo>#C{>T0p>ikE*9k5yT!ENu@*E^~8;2
z&B`et;4%eli89FVXjv{hq)HI))+dlUkBDH5mcUm;eMj(4rL3wrUr+_k`Ha0Osep6@
z>e$Lv@!qdbAW749-!7v-=Zewh_oRa|&J__zQbc^NV{OC(YbhY&an2Pf;6R1PCdXE*
z*AZxFQ#}_S9qeIhVmKH7?erDWLIO!M1&>c|E7gGdduqA(wxM30*fo}m|9Wb!xxw`a
z#Em3750q#Gx|TGZ<03*MNpfFblief0FU1KKW%klMTKE%mjdR25Cuc9s6Ih7j6u<)k
z*}=L6Uf=oByI&1#9(<uz3ryT_$OevOg{R`cvZcRH-0*t&%GG0Y-+lNh&<HaoHDGAr
z;)x?c_4#L%TGZE5F;N&0MFG_)APNJ*z_#z!8p6P0jLEL1>Z*!};zjVHIOj>dkR+ZP
zx0dwpn~Ukf#S=$>Uceim0t^5<fw8`wd-n9-_v9;4-^im-rXQF7W=gtv?e~R?Cyp-8
z9X}471m;@=HUZm#`+-rQo*C413q8A*fSbU1U=Fw*0s_Rq^$hSPP;DI#yEqg`f!n|h
z;9tPCOc-RK)n(v@?hnaG#6SZ`&9XnKwga%~vI4EUWS9O2b)7aZKM_5p00000NkvXX
Hu0mjf@!T{(
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..2501acaab51de52c513812f2d531f4695abe5c2e
GIT binary patch
literal 1521
zc$@+81rGX&P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11#U@1K~!jg)tTFC9Yq|+KQp^~a*~{+v6nQ~Hnq^Iy&$4e>g7SH
zPq7d6K@fcML3}O+!58tNf>!iD5TS@7DoBMY7R5eUf>_Z?3r!mm)Lvq1noD!e?#}#t
z*xlqLXU}DGwmtR-!|u-P?tFjq{r$c(yQ4&eyV-Q70kmswTIIHpqx-a{4@+nc3X*!y
zoic?AmFs+E1N;8?iPulpw66@IZ6inb6}p`7cRaYGxMj;G-Bs{#9gU+ET7lLoK36yz
zl#1$=QYZyVrJxY70s>eohzQ1l6~S7;#@EKmVhN4K7@^_^{QcKuJ3cm64g<S?r4u!y
zs~vrK`vW_Q0~?0)rK<~s=2n|y*q%9BF)%o!?-wavx^VF@@M3j)O%8|+4{pA1qn?^B
z6NU!FcC;8{n4Yb0@1~7fY<O@b-Wmo3+=Ay31f3oEY74DU@H`|1Z)$>SC5YJD0!Ast
z6Fb-O)UFNe+|tjw{w{ipF4hWV->~2trfyca@^6_VpPpTYDa}$Ha1;@RIoqz`HN5fC
z9yYJ<sqIrMJXh1#<1si;WcSuJ9Qow8C7^W#KV2eKq!fADqubZ=-m8z{=roy1w`vUa
z9!qBca%G^q%i+zJAI=1x6&Rc>4xq@DfdhLtGf*mIes0waDDq9>CwC9lZJWAT=Ge(G
z&QDG=J@0c*slf1HiHC*<mSNCYazHB}M+SBd57cct^6?qYj9p*6zIx*p=O?H6?&m+3
zV<LkJA^9=TTXZQFoYc1Ya=<SardoPW>Jo)|4v?P;mAbvUZC7qAwA@do8~|xsg}#1!
z1kcsz2FkN-sE=>o8L6rN@SAgd{^P}Ebt=n5mIni+ZV#{C>=T>TDwUyvt84nNHw>u`
zNRBzM8cXj#V-n}7LaVa7nSpc_%)o%;z`*`PU!as?Xl)Olz4d(E`<^@WC4pHEHZ-<9
z2COx0GvEg{K86kNs{{c-*u1ZLc<MNiUkEi-Gigup(nHABQn+es!GTuh9I+V~Fk*9L
zpz(X8#lA9ykTEv5rG(T`kHz*DL&(?+DrAk#?}Mh<d!)6#vN2%uW1v|Mw9J6X6hiIG
zXkyL4wVDGqOA@C|B&)WTRH%7hHcJkKCj8&2kTE8;K0SoOh=JE$c)UsHP5Y(P-S}hv
zl>?8|RTuz2FdRGaYt|4l@yN6vM)f`g6VnQ$!97|>EQNI#Nd4jnLzDZDtyP;uLQqeI
zG=N$%4RO4QT}rTaOA~;NpN*Cp2?I(goqz>!<CCOlfFNd|*(}=H05*|P8uydT6ICJP
z02UCX6mAu82k;^XA{DCmAzfbjFOe)RG;VIpQrQop99UYGcL4!l0IOpMoVcMEFuot6
zfz!WFQ1KhD=WnMiR02lNPU2{V9~ffLy)jk?P%hEvyFd}>xBlFz+1bLg#iFCmUA)2{
zW0%_o^6p1Jtom8U(X8w5Ve0yvSby#m&`(6G0c;XNE|FKInTgTkPS-O}3q`N5x1c=N
z!EqF><3yW%j>6FzM@RpBTt}l+yz!^i;yFr1i4|}DRh!6CY>UL3eaVKOwb;eYK1&c-
zu1_z>wHvd+%*5z%pahhG3J@d?Bw^%DUpP5#DsvzBTlbF4_HEn)s>6H9VuRVMXJ;lx
zPs~pKG)|PK4l!;86o76bYSsgTz=rs`7(b9Wc}J1QB_JB{8DI*y2K*CWFSzkdArU2W
zF<={?7hqATI$;SmAD9Pj#<(hRy|_eRLn1E~QF6=^<wTO?opd0<R{<7cY~{GlCUZdb
zJdl)5gHNp5iJ+<&Vh2{v#ECO2<GvF)P<_5AopBLBl!%b5D_9P?(<8sqr0OUDA|n3*
X#Oqz6I>X3;00000NkvXXu0mjfGmX70
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bc42cf9b0b3251a61786d99628207d2978969cb2
GIT binary patch
literal 552
zc$@(!0@wYCP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10i{VqK~y-6m6N?|6hRoqf3rKg%itZFAgF~!4(vpWL!t!1-cPU+
zJ3&&3mBoQz8Pw83(%9J<@GlUXASz-jmSTOmnB-<ZX6CgxH+#7c<lbuDdEWWW^DvC+
z+<5U=L^ec%VS!RAvP!9*TDkswc<IWjSw7Lmq%m0%k?4pdRw$(qgb={_Kv4zq(ql_c
zf3U~*FJG+|3Fdg)@Z;CcA_nN3X(1Af21sK;f}1(G)K0m5`7Bq@pJL^7i~Zbj>)8iP
zGSW4Gj)dT61D@XN(mi()fStX9G>Hk`k!jTcBIW}wbd~{l@bV)+fA69ch>Tnx0u*5?
z!uG4XNBTEUt^u(2XlryZ9*ZEs&vh_a^<2c51LxcnV0Ha10G~JSAL;8-5*k2NR&!sW
zu1Vbo-vIKm{BMLwy{f7PFti21JJ#=X=K>zyym+|YeE*HSD8~Ug;vMoY*USiGns|q`
zMFTh(T0(HVe)nnW;H<s+(i&iQ{~Va5R>m=tVzLC2C1j~a#}RQHp@1NQ_d-!Q%F59n
q>;qV>pw}Pd8~s7P(02x`g5F=w(8@aM?(+5k0000<MNUMnLSTYh=Jh%N
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8390ff8f3e710164895752b1c77c9a45f2c3a2cd
GIT binary patch
literal 2024
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
GLSTaOh{MeQ
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e0352ac69fc610dd8fe36777642eb5fcdbbe16e5
GIT binary patch
literal 3168
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
GLSTY7Pt<Mz
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..396b967c651549a73abc96fd1ca1b0fdfc298d9f
GIT binary patch
literal 865
zc$@)Y1D^beP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10^UhPK~y-6rISx+6L}QJzi%>`nHWu>riW77lPd};1rK5?qR?JM
zK?<R??5(h@p&){-FtE@iIOsu9{BuzXVv9oYA6?oUwghz##iTWO5T#mj2(%U)#?EeL
zewp7N58G<}bMwKwynlS&<NHV{g`Y9~+kkD`otmZ{wk)e#O1YhgR*C3!7=|yTlz%yn
z^I~H?trOU`z1uX+n=LIZdpkNh%*MvXSTdOe=Nv&0!1sNX&*wwW^NNhIGmhgFKM$~N
zyQ`t0;c;JIU!u9WnS>DEp%M{@2+PaMYJ7aW=KKCp$8ny<>h=0Bi9}*1o6T-M_Q&7!
zYu9#2DZg^}RT4(yS==b>z@c5k)ZX51l*{EzKA(TA8HQo^_V#W$ef=NssE)zQ1@M&>
zh=&g$78W3cK=3ahgg_W@__Y<hTDpr&CX+M_BdZZncRHP>izhq4qX?I>orvz=2g~OX
zo;vk^<JtgL<9PJ^cf9}b7U^`Fi0HV+Ip3=5I)o4qQ3N3bR96?oks}B_?;C;$tG<ha
zJI^8(i$O}+py|5)#&ul?A;6<LIOq5{Fo2+3Mo_7MbB>4soO7^%<KwD}m+v0H^E_yp
z_C#ZhjZ9BZ*DTAzj%_J){&ojq&mPofXCV(9Kv*gPSR<%$oY;R23)QEXnwkn2W22;$
z!pO+T)uyJVfu5e8gi;Do6#Y<j@pv4DVPJA{GFV((ypYS~{@f^}?sz<YFO$inQmK?4
zMG-8^f@zviN+AqGR4SGF%*;$(2ys4_%boj5i2yJ>JiM>9we?wle}6(siTU|?RxX#}
z`@Yh3y~-H7SFKjBjE#-CN-6pI7l?=e=tDz8-ED1cy6d`_n3(v_^Ss-oQt3vaP*?#V
z0SEvbfJsCg0AGJ50zj5!W#;DQYQ<vl+0xR|t<llZ*|nSoK&{tpIE#W(Uwm+IFaaP2
rAP&F+un9mCKmvfdMy#!`u9U(j@I#i1ARQ3<00000NkvXXu0mjfd3=s2
new file mode 100644
--- /dev/null
+++ b/chat/protocols/overrides/jar.mn
@@ -0,0 +1,9 @@
+instantbird.jar:
+% skin prpl-gtalk classic/1.0 %skin/classic/prpl/gtalk/
+	skin/classic/prpl/gtalk/icon32.png	(icons/prpl-gtalk-32.png)
+	skin/classic/prpl/gtalk/icon48.png	(icons/prpl-gtalk-48.png)
+	skin/classic/prpl/gtalk/icon.png	(icons/prpl-gtalk.png)
+% skin prpl-facebook classic/1.0 %skin/classic/prpl/facebook/
+	skin/classic/prpl/facebook/icon32.png	(icons/prpl-facebook-32.png)
+	skin/classic/prpl/facebook/icon48.png	(icons/prpl-facebook-48.png)
+	skin/classic/prpl/facebook/icon.png	(icons/prpl-facebook.png)
rename from purple/purplexpcom/src/overrideProtocols.manifest
rename to chat/protocols/overrides/overrideProtocols.manifest
new file mode 100644
--- /dev/null
+++ b/chat/protocols/twitter/Makefile.in
@@ -0,0 +1,49 @@
+# ***** 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 mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of 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 *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+EXTRA_COMPONENTS = \
+		twitter.js \
+		twitter.manifest \
+		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..207178f2bd66056a1e34116257f2b3cf574116a1
GIT binary patch
literal 1718
zc$@*Y21)seP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11~W-SK~z|U#g|=(TuBwjf2Zo++kJbwJ3ZNCoP6mf*>%Dso2<sg
z4@5WYlZdbgA}qS%o9IG7d|1{8A4EkFQBYX+K_C18(Fb262tFvwE*dktvt}I=GGlZn
znIzLQJ=5K{??)XU?(I9>^N|g>;9-iYxm9(}zy9Z6A1$iN|I@tfAD($-{%p;eZ+jw-
z`$i4}B7l&$%68F_w~OyZhYY{uf10W;$C-OQ68HQ|Pt0B!jVGfFeEv`K7biUPy_)9*
zk2FGBfltkvGWgJWIeD~Q2A8q^ewNWmQWm=rgUrQigXHTket7o#I{<v{<u@M-$^LRE
ztOSou)=?GOaY8rE&=H4ay>0d5AaXMzOn8>bz(Yj%$9k7LgE(G`(ht7$k(`M#1(K!T
zss>(gx>aXA&X{X&5Ia|f2#nD5JrHOQlJfgF?YpO`Vhv|nb!M71*6*c(@0srapBMvR
z3};W&Lln5O+97hTT-$}|7N0sgMZ>oM{JR(Ns~fji-0UNo1JQyJQAHW*Lr{e%b<DRn
z`Ov|Ayl0}yX3{-V#w`=3yt@_n+>K&-nZqeKRo=J1!86AXQTHu9RbqvswJKkpImZ6L
z&&Q!S9Tsp<&UdOflz!$|9V9e;9}$l10HBK0JVPhR%89D*?8(Cb+)kBl2CJFUPL;Z6
zdFs$ZBf)uFFr73bv<B5JrIsmh<N>o{B7ikQ-LrI^(#;gVn6{zHq-U9F)^Iw^x8}6#
zmM}#WbZc8Wm#4>#?7R|y=3{fjh3;(;Fja^O`t$$u#&j6){F&ngXeCo6b;`m<k3X-h
z5oOsJ7zgOc0>=Qn*52TwQ<L=4tX!2fIf6uCGt*Mtt^jL9IN1o<Zs+zlxG+7*cjp&b
zk5fcI9kk<w+mYpuw^w%ph@4|1O<C&pxw5)JEAV)<F_EW7l_=klW%B;oO|gI#!3qQd
zz6gravW5edfX_ZW%{S(*ac_{Y7N<PEzd_UY7!=!k41jM8Rs>H3BSI(1xHE_W=sS38
z;1J1GYXRQ~H6v6+@r+<mKuHwdNK>9{dYpf#$#Op?${eQfZAI{nxeowi$^jEz-kkx1
zp-3nyr`#(T@g!$L3bs;()l{il;c!^xW-rQv6*2Y%U_`L81;7@^oKqz(l(XC2IoQ_I
zu)>rtbdr>nK|JCwkFf^;DHzDxu%-4)A$H@zXKNO}IPHewGy-)ioTwVAM)>*l+oeWw
z1}GTVy0CW9z!n492!MebU;7hvkERuNvnX@?dTE7UF5Vhnt=uOC-Y^9w*FnwzV+@Si
z?xCTdIlgxJ8dul57%_}27He{Wdm{kKmTv@Wz$+;7jWE239ZIa@WiJ4sHT>uUkMi8i
zQR==eefg%?1tTdQV_+!4(Om$L6x45L;CJ`p@@O74PvB$wd_H~bAb~Nw_|N}r^_lyM
zaO)fx9WZc?_l6c>TnBTT=^h-w)n3NMBOy<|tHn>RFPGxo?Hm|SL7{<B+7>!JLL;27
zTVkgVRPMx%Td||=Sq|4Kr7vq_$1WHFkkb<sDHxXD+`NkdPqhM0R4uXNZHqx@c|xkn
zMv|4jg8QYwGsg8ZXIg<jrqZ|iF~7Zem(LtKz{R5>Z*)^GwG%c{H+C*Kz&Qx5@WtsW
z2YtiKcRNs|6`&RP^fQNNjN1u7WTBH}rw)Yy4c`)FTdKRXyvkaf@P*^koSyJFJ+b38
zzr&Wg1Aei%Qqo<uhN-I0azDlsS=a%fV$G{dy}_v?wF>7a8_cbB$8N35?JjS2ZZOlV
zaiU(OVr17xsRQQPUFO%jXp!2AF`R2nU_@Bz4X9Z2>d<fbEdR>o>yKFEwW+Ef&NgcR
zwBwX+nz3yMKCl@mpXC65@AO!Sl75Ds{mJ`JUK;}-BH@>Q|H`wq0|$Os^=$R{M3sHM
zCA4PG01smQ%(0$i+~`I`X%@vBo6r6D<L7>+s;&eeB2^#+Y8Srx!l~I$K7Fy$XrA*c
z)nn{^>OQDx8V~*zcQ^mG@P|u3xb)2zt^z$(?d=Mns6!xl2ZBR>TN|K1Qc3_GfT~6!
zBIGx23Pj`&pLYU4R@4a)7rvumr)>XuE+T#r{C`XSxM=|-(QN_$3mQxVJ++j@XaE2J
M07*qoM6N<$g5EzaZ~y=R
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a906034a29872b8ab8a62d3fc5dcfdcaf0c84eb0
GIT binary patch
literal 2598
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
IM6N<$f`S{uG5`Po
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5d3df06ea3960bc71be37376068c9f60296969a4
GIT binary patch
literal 789
zc$@(h1M2*VP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10+LBYK~y-6eUZIymSq&if9JmM=i`0)L2IS0R9XiNA!^Ws1Q#5P
zqlq!ZU5qZ8{v8YqBn&bUr;db;fyqrl9R;ZjLb0~>X?fq4=Y2lzFNe3hU_!W(Go0af
zopYTdt2h75o=i8Zh0$LpA}0k<fQTS~2nd1_4tv1{|DdwrTGmf5n{ul9?ubq=El=bu
z7dg3BV;C5ljBKC_fz4riVzX{9?#;H*7|d5oMaFAs!lSC;^W}Mt<_SNQ18zPp5kS4L
z&2(aTd#WH189IMKiNtr7ik!QHr<`AzXK}K?>x55^z0R>B$477>;$p;wNWXL3->+Eg
zWhjx8#)U|xg}v6XkZ0_;hyVfMi<NnP{&&Dr=h<y6+f9p$ktdxaRSF*?W_^FiN7hq&
zPojjqHjJi5#X?c=*-C*CNENIPDz4mnMC}86t>sQRz*NpNu#UU^3ZsO7T8~HA?mU}X
zn9zbDG7OP3(-Z7AmV5gZ@6AqfU_B-`nnWpbqcNiByNHbufYOdW5dkCcegP=qe@stn
z5)pb@(}h6gBR0ZYnd0n}8Nc#~5pMlmvQ>Ay$e7${j2^i)eq`VxBqF?#DxT^0LB-l%
z+vG+AjG2+a;W}LibOGuRS+5;U84y4V%$k&IAD-fyJAaI_zbr!8THY-TKMpLFhlh=S
zegt4?smBMiQ~a`fFlJP4G!9tkWnAAV`FJMb+;oDD5W}c!gvC^GG*Rq!j)h)^gTn|~
z-`=Y2+0!$V+&>s{b$yfb$LIKTu0V^7Z*X8eH#T<g5l+ucvQ=Aht#8ZfZx6l{Q9m3n
zQr_%kWcoSuGPOSPxNg}PcElJim^Sv;X7rrwwC>xT#+`X3{Y=8IxsvbuuD|vlI1eb>
T^vKSy00000NkvXXu0mjf!kuNR
new file mode 100644
--- /dev/null
+++ b/chat/protocols/twitter/jar.mn
@@ -0,0 +1,5 @@
+instantbird.jar:
+% skin prpl-twitter classic/1.0 %skin/classic/prpl/twitter/
+	skin/classic/prpl/twitter/icon32.png	(icons/prpl-twitter-32.png)
+	skin/classic/prpl/twitter/icon48.png	(icons/prpl-twitter-48.png)
+	skin/classic/prpl/twitter/icon.png	(icons/prpl-twitter.png)
rename from purple/purplexpcom/src/twitter.js
rename to chat/protocols/twitter/twitter.js
rename from purple/purplexpcom/src/twitter.manifest
rename to chat/protocols/twitter/twitter.manifest
new file mode 100644
--- /dev/null
+++ b/chat/themes/Makefile.in
@@ -0,0 +1,44 @@
+# ***** 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 the Mozilla Browser code.
+#
+# The Initial Developer of the Original Code is
+#   Florian QUEZE <florian@instantbird.org>
+# Portions created by the Initial Developer are Copyright (C) 2008
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
rename from im/themes/browserRequest.css
rename to chat/themes/browserRequest.css
rename from im/themes/icons/insecure.png
rename to chat/themes/icons/insecure.png
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e798681e9819fdc7e092fc5cf96dc1f3950264e6
GIT binary patch
literal 622
zc$@)l0+IcRP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000R(000R(0q|s!N&o-=8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10qaRbK~z|U?U%8N8bKJxe>09Im#`5Jvni4;_y(!+78ZGg+zW_j
zb#h>7<=H6-RsoxYR5oHGHfcf-ggiln6$~-E8rR(~g}bMuiX5lS{^4U;nBCuR=9^+h
zi3q2RJ}EsB01QC6Tz;I(<*xGid@-F)tNR4{zAv-c?9+Tcuhr{y*8t>lx$?!u#ieCg
z_X>}*SS&7Et=0;-HUPG57cI+D%jNPId@RdSwrv-IYYkwGNgai}mza6-O_&HI0*OE(
zkO(9KiGT+1Jn#3h!7<YSIF55OnM~S+Lg7(7K&kEN%=di&j4>EvZr}e+JpO+&nM^##
zac%%qd@-q1DzCEH>|3q%LlIG%&E|EfRC>8yugPRGxUL&?I-PHx=Y0jxdfPn_(UE}K
ze-f>(h@g}bfK)0)7>0iw$9dOiG`@(45EqaJ&VVPtd97Ca;JU7?Rx25g$6mEseGj|<
zo*!7xqIwFPNB=(q(ju~LL1e8WYYn8rFw|OW27|%RUaxo6Y&JhfV-7tzE8qbT_b!YW
zN-4D!h$4Fx0ztdo{xKSj-gLX&?*~Hn6JI{VsP;Kq0TB_URKRX_;dDCvI2;bk{eJ(~
z9pG^S_9g~wfIvicn-Feya*ACm;t%f<75x)-s}RIob?WQ+U+9I*vsErz;Q#;t07*qo
IM6N<$f^qW)?*IS*
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3fc98a6e34afaa6d63ceb7685ffda21d6289890e
GIT binary patch
literal 992
zc$@*?10Vc}P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H116@f(K~!jg?U^xXBS#d5|2Mlkma?pipu(KN0Uf9?q)3-^!IcZw
z;ULAOa3x$_Ascd_xU&UrjB#PGapA&5aA}Oe;Ko&&b8!TMBk4c^5y`>9ifm+MrQMez
zJMu{OIR`m=a>xF#?950z^MCvH&A<#XGu~$j(+2*lVgS>M0Zhx*EA#X7kEE1yQpzt(
z8M;fp@Birg{@U{L@^7k*)HJ%Vu<%tXmD-+}nQ_L(#_TutVo;4nqqn!W*F8Hs`(|lr
z>3cwnKq8UIXS3O)ZQJN}yXIWpp>#TJXR}$mP$=X9Tm$5CxyKU|6X`@EfmW+!)Z|_2
zcDooI9YrdYO6PL9$Av=SwEzIeaXioSdhf%k%*^mSuje?92YdjtPz+#NF@R~s0HzfK
zm{ts6S}}lW#Q>%i1DI9}U|KPNX~h7h^<e-=DXX<w%^@NXk!eqFl=4@r)f_2h6^OPL
z^Z9%;pU=N2m&;EwnG6L%aO2@H4AJRy5QgDEyOa`A$_KCySeAuSsl>kTzgS#cYy#Tm
zuJ8NLcXxL`_B`*)OeWJCj>P2TWO96bT(sNmep@n`1QB6>fB&l8ZuhB$5K!Bcq;;f<
zdZdX6LJWS%!)@xnrBcamwOU8M??3PVrtgOmk(isC`^2)WPnns5AP~$<BO@c9O-)Tb
zo1UKj=<@OsL<HA$adB~h_4W1k>FMcr=jZ1?2_gDsRhgMd)!(KZ-9y!8+crmUKfJoS
z`gwD6^H%@?Glv5aAR+<4T3cJI1Na?)g@1Cynw_0>^f0=vi%O*u?Ck9Pd2({{b+K4{
zg?FoNG&TbW0R-CJiu{6^L;WCwv`Z-S0IXiGXGL!YuIu9P@X$XxIw~C;96UWfKK=v1
zeI$X<Oe-lM<rBA^#0*bE{SXI1fbH$=zbci=4;vdB3(aP;_wIf7J*WuW@S|6B0LC@p
zK=^Fi4yx6vv$C?%sn_e@uCA``+>>$LOE`4t{#5xIfSJQ+#vojWjRCM_SwX#CZ#5c?
zCtF)vFYnnrA`i-_4xw@(yphBaL=a6`ickQcPN(xrxm^CdSS;2bz`Oz=&Bs78Gjl&L
z=(b~}C=x1>`w0_u@(@zv4g-WdWcXHqVX4Jv_~HAKzWDvym~RE}f7ajC0B}ut?MA@>
O0000<MNUMnLSTY=sMf0h
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ccc1fa166cd89a7da7e4ba9c0d4b8a287e37cbe9
GIT binary patch
literal 364
zc%17D@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2>u
z=YlX}jY;-GprB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt(S-T^vI!
zdf!e~%scEL;Cg?_?yyi+oo}*L8qN0(N++ybz-HHwsh{{nSVC%Ai^!~sz}Z!AeLR^j
zpD0S)Z}Q=<WbZ%m(A4g-*%=O9iz@mI<wCBmVRB8&&h7ke*Y|iuwrStus`rZnLm$sk
zZrSjv<hjhMEVKU)?myt?>FGG5$ntm&bHXgONh&)z+XMtA-i*jTy=oQTs;pC+mb|vg
zy<HYL?dkQDxJeqTx;i}OJ%4WE>wnl_&)3@jS4__S7X8L;!7OMIyDdWSr;S{{erfFf
zV-lh}b|+0>5c|Q9R`+Vp=}m70Z!mv1Pvf_Ez&Ig)t^bsZ*(Pl%Ku<Gxy85}Sb4q9e
E01>8;qW}N^
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8de4412df0a1ae35cd2ee76e4fb5934a973364d5
GIT binary patch
literal 1093
zc$@)61iJf)P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000R(000R(0q|s!N&o-=8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11Hwr}K~z|U?UzqTBUc>9zi-}~F-AhnIx|h7w1~Eax>DLhBRz;(
zq%G{V2e*fw6c6IXNG`4ySv`0XDHKJ>vBXOe6w#&?6l53IgDr$jES6G&IwQ$8&Hv22
z9?UFLTa(SKbuazFW8QoD{eIui<To$*4dI;QRhsZh)&B<ozyM%!a+3OdzIS9<_KTue
zHz=7*zL83$?iPzh)ih0aOG`^!mgS!nMLDk*TP~NO>-uRbm5R^L&l?N?d_G^t$jC^C
z$K$CPytcO1wZFgrMLM1SkaJF~{ah{wP1B5Wx%}<;_;^H;B(qkYOeWK@w6tUZh%*3C
zRn_nDc#zNMuMNuQ^K4^d;~@ZgjSD?KKK^occD5}P3VmG*z~k{iRaHNLxBvj6D3V$M
z0MOjrT%nZatTkgSLn+N(^*cR1{d8w%r=wmzOOw@ew42-Q{#BOcqwenR$GyG1C+T#$
zX?1n=vqU0s-!#qUsv9{tIOy-|>-*(JayA4oH8u4>k|e`gx3#quMn^}#o12?^^ZfjL
z(Av-E^XiM{Z0H!;#qHMF+4;!6HVnh{p8#B&L=Y<Wb!%&D;#L6?iNwd&oDjmhy1E|K
z^1o4lt*xzh&(6-C*I!lD?*|75<F^8kNF;pGXfy<X0D#x)eKI^eywpgJhE9RqQmIr^
zI2?XZDwPxfP!#3IU@*9F-Gh4L04pmiU*&SSw*kQK_iqG)!EY#~4L28#OQ7reM*!gU
zdJmk6I|evBJbb-aEWQQ+Jv}|EPQ?L-B`BB6lv0|JBuO6_7<lSb+%Z5P5coY12;6@e
z;g<qPCX+4e>+AiJBo&5+hJL8`|9|5E;c$3Z)3i?jAd|`585<jmI0X;@Ae+rLbavC}
zbhkCvb^Sdj!j`500Gg(q#9}dnF$Qahq6m9`$QXmm<pQM?ilRKW_S@UrcPXW?$JQIM
zSj^Bg?F0ab^<okVg}h#`_bovX1kO1smCBuoi3xY9RDvW)$Y!%V91j1H%jKRKhCwba
zF8V2@x-82-0RSPFO%<^w|6+_W7=~eLn)chm!a|yJ4sgy<g&?@>_ZR?iW@hGtY&LtZ
zP$=9xIy(A%dV2bO04@iksX8P8Vl_XtZl2lbEph^Yn5IbtK|nMbEpKjaK3!Z~JhS;U
zVjP#H<^W9F9s$7F6-Q!S2_bxWdAYc^xA!CxiTvq6*lzY?%I#MMT$Z8wEm$9#$z<|$
zcXv0oy}kXnZpWcnH)d%(|LG=I-;Qk$kv-@p04#BEo9I6PZrlC>wKIJY1MhE|00000
LNkvXXu0mjfK=JgM
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7fba36968fdd6f9ab6b94252570948e99ab8149b
GIT binary patch
literal 1692
zc$@*824ne&P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11{q02K~!jg?OJb46K5EI-n(m$9)-5HQqtLMl3|#eI0WMdr;GAo
z37IC#9LCI$%nUOY^b;A`7fmz2U`8}qf+-q}p!fk3NeslX2yx5AEs?=k2119e+zK8-
z_4@DbdcE6+arG<(fnFh7{3Vy(`@GLR&+~iV_j%v9?;Vn58UD+_);fT6@ruA&;}wCm
z2B9vvT&^sh=ie|G43>0^3W8vWL?Y`&QMAQkF$+ae4^1YM7XYMm>_(%}07;VGlP6Dd
ziVP{!XnlRXBQGy+Yehu`mY<)GmTNo^2#_~!+}Pvscs}Gf?)Bt)9LFQs+1aC|rKRor
z_U-$9B?P9XrsS@!E{S27!G?wgKY*$Sj7DQ&O-&7s<2c0Q@g*A#g+fGAQ`4t3O@9!N
z$8#3ai^t;>%d+qG_V#Y|csw1owY4oqqfuNAfr5epR8v!fH#RmF0)QW2E(csL7iBV;
zvPqJJNF)M0&oB9MyWOAoe7*yV1)l^oF){JcsZ*z1%kjhWJVYW9AW0HTCR4V{<)RV<
z0D#EN&0W#><T%c_lIMcKVDZ(fSKnXBvvaW$02!KvFbs?4<mCLJ)9IcprZ+S+^x4eJ
zOjbI+h?lD@4jjh?004@j#vKmFkDE4a8rr>kw@0tnO8@{pJw1ip-QD$qAlQ?i6$HV0
z`}Xavm6eshtki$n1j@?F?%3`2hX)TH{0YbLc{{_sd-skx9FDIpT)5ztBxzo2vn;zl
z9sg+)*tKhy7XZAA=@b<e&2HGRq4UwBM;|BG1%tt~2&~#loR^n3o=VR1{8DGHlvp(a
zBuPe6$t@O(FCDw9M!@g)znMzDapT6(bnLDg0fu3=CChLe4{qPS{jYTFt_p#+wzl`e
z;qY6@^39t!U$$5*LOQlHPQd5$<qixCe32|S8jT}WRaM>T+RrEfj^l`n7cYJ-ilRv^
z&&tZ0ICSVxL#lOSxk!5*SPW;+o~;cAgYT$iMx*i1>gwumoK9y*3m+LH(A3m)fMJ+&
zwQSwGb$5>+Ki-&|o150SS0f_?IyySGc|4vfwajj}|4>&~_nj8QMvaW*K!1OKB>*J;
z)mg39zDxuUkO2aNgM;=^DD<{cCP{Mg*s){ZW+Hfi3=r^mJWh4l>2!Xt<(N-~<^%$P
zK%Tn1W5<rWTKiB#a{{HMrN8O*`o}nq2W>Xnoh@6oJl5KW8k)~SB_$=3B_$=FYi)NS
z{J&1-w7|W4_nfzG-Kvg8qfWEgJaqW*;qy+XGpMy61)BH3&6_vtSe7k`#bUPU>FGT!
zEiGSa?L!Ss33PUL7DuDe0<|m<2$Tf^0lk)f)W84${C<CwrfCcSfFM>rsyL3Dcj_QX
z5=qmvdBsLmP-3HL8uR=8QGmG|aJ${H6DLkgj*X4IR#a4!@@!NTMGyo5MDfMrOp+vl
zBuM}O*uQ`OKwn=UFG&)q)LX6AUw7`@$!I|U$8i`L8392MCf#m#EJ0wd@<Cf$o8D|T
zTMG*d=Pmoi#l={Dem+tYpePCe0J^%m;-OGT1_04!vz=!crUn3T48xw-?e@#puV0TV
z0i;5zUQeYvHa3QyK7Bfa<M;zbhSYB<5klzb(W3@~!H^S+#S)t_ola*eFE1~ssHnhM
zmIZ<!fTAd1Sr*QnI~Sjtni>s-LaZo?2mk=XupESt10m!UMUe*pAW8CtBYQ<x4W&U+
zL8sHnv$M0I*4EYt0DwFfc!D}Y2mt^zH#c(tz{9`0Ndy4s$dMz7WLJV8A0L;mT)83+
z4-faZx3{xN{+<B<y<jvihdk$7R+VM793g~cS(cOg4yC%(twm83^z`&dy}iBR?(Xh^
z`}gk)p#5|#foeOx0AB2YrQ*`1OVa4*=+w1q*M@1D&eU6SrSSls_d-e}6Ht`Z-3J6g
z$X>4(JAL}JG(9~%a^}pLzcmXrHI$*E+$$F(-9INF%d)KG0VIt<f*@puVPXu!^fxy*
zKg)3NYRC)x&QD@RILARDfB--ahr?l?&-Zg{Ybyt<gX9EOeq|-jgyKRUd#HLtolL9s
mWk_-Y&kH=E`08twHO4<p-m6_PY*ID=0000<MNUMnLSTX$n+^#8
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a3ca23a495c0294f5b15a4c7eeaf0ee751774ba7
GIT binary patch
literal 588
zc$@)D0<-;zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000D?000D?0em!Tp#T5?8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10m(^3K~y-6rBgAB8bK8P-t5K*OK`0MvVzTOl_KIH=Bi*Jfm9}i
zq_PRZH8wG9V<lL`#{Uqj7)Y?VLWDrH5KI#x)rGZ45fIc7^o$#KCPiG~67@K4;4w3A
z-uvdgkMEI`61Q3GR@nfkTrNjl*ENL@<T*E+jeoUTJy@^T4~ghf)3kHH-#@+bGh<Rw
zlnd2$U9(gwk*@2zN6WI#mdoX1?>?W;pXGA7vt%;))AMo8saC6*st|&7T?glU2M~=$
zKc`ZukA`7P8jVJgbAHn4bWUTj*n2NV*L4UXNZr?0Hk<w8olVpHG#Cs{7K_FGeX-Y)
zXxsK907xVf?HdC$o6Y28GC7SzBJa}a^u>(;X0zGde!u@J91edd7K?8W#T^9b^?ETy
zQ7#LGLgQGKdr1U<OeXWqFpSrlru{w&z!;O9^PLVH$AQo1L#0xAF&d4Y2LgeY@pydv
zZzAU$j4^pdiPdTq-EJ4{c3V!T(}d$VPlCbV8&y@E|9amlk))I$B3PF7G!zPn@p!x#
z4u@Y`t=6vtRlD0=NGXNK0V5*Uw(alrdi@80V<XD8<`R*_cAP1n&)>seQrR`80=NS}
a0f0Y1?YFOeCnuc%0000<MNUMnLSTYsl>ajT
rename from im/themes/icons/secure.png
rename to chat/themes/icons/secure.png
new file mode 100644
--- /dev/null
+++ b/chat/themes/jar.mn
@@ -0,0 +1,28 @@
+instantbird.jar:
+#ifndef XP_WIN
+% skin instantbird classic/1.0 %skin/classic/instantbird/
+#else
+% skin instantbird classic/1.0 %skin/classic/instantbird/ os=WINNT osversion<6
+% skin instantbird classic/1.0 %skin/classic/instantbird/ os!=WINNT
+% skin instantbird classic/1.0 %skin/classic/aero/instantbird/ os=WINNT osversion>=6
+#endif
+	skin/classic/instantbird/browserRequest.css
+	skin/classic/instantbird/prpl-generic/icon32.png	(icons/prpl-generic-32.png)
+	skin/classic/instantbird/prpl-generic/icon48.png	(icons/prpl-generic-48.png)
+	skin/classic/instantbird/prpl-generic/icon.png		(icons/prpl-generic.png)
+	skin/classic/instantbird/prpl-unknown/icon32.png	(icons/prpl-unknown-32.png)
+	skin/classic/instantbird/prpl-unknown/icon48.png	(icons/prpl-unknown-48.png)
+	skin/classic/instantbird/prpl-unknown/icon.png		(icons/prpl-unknown.png)
+	skin/classic/instantbird/icons/secure.png               (icons/secure.png)
+	skin/classic/instantbird/icons/insecure.png             (icons/insecure.png)
+#ifdef XP_WIN
+	skin/classic/aero/instantbird/browserRequest.css
+	skin/classic/aero/instantbird/prpl-generic/icon32.png   (icons/prpl-generic-32.png)
+	skin/classic/aero/instantbird/prpl-generic/icon48.png   (icons/prpl-generic-48.png)
+	skin/classic/aero/instantbird/prpl-generic/icon.png     (icons/prpl-generic.png)
+	skin/classic/aero/instantbird/prpl-unknown/icon32.png   (icons/prpl-unknown-32.png)
+	skin/classic/aero/instantbird/prpl-unknown/icon48.png   (icons/prpl-unknown-48.png)
+	skin/classic/aero/instantbird/prpl-unknown/icon.png     (icons/prpl-unknown.png)
+	skin/classic/aero/instantbird/icons/secure.png               (icons/secure.png)
+	skin/classic/aero/instantbird/icons/insecure.png             (icons/insecure.png)
+#endif
--- a/im/build.mk
+++ b/im/build.mk
@@ -59,16 +59,17 @@ TIERS += app
 
 ifdef MOZ_BRANDING_DIRECTORY
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 else
 tier_app_dirs += instantbird/branding/nightly
 endif
 
 tier_app_dirs += \
+  chat \
   purple \
   instantbird \
   $(NULL)
 
 endif
 
 BUILD_YEAR := $(shell echo $(BUILDID) | cut -c 1-4)
 BUILD_MONTH := $(shell echo $(BUILDID) | cut -c 5-6)
--- a/im/components/Makefile.in
+++ b/im/components/Makefile.in
@@ -41,31 +41,24 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 DIRS = mintrayr
 endif
 
-MODULE		= instantbird
-
-XPIDLSRCS	= ibILogger.idl
-
 EXTRA_COMPONENTS = \
 	contentHandler.js contentHandler.manifest \
 	ibCommandLineHandler.manifest \
 	ibStatusCommandLineHandler.js ibStatusCommandLineHandler.manifest \
-	logger.manifest \
-	smileProtocolHandler.js smileProtocolHandler.manifest \
 	$(NULL)
 
 EXTRA_PP_COMPONENTS = \
 	ibCommandLineHandler.js \
-	logger.js \
 	$(NULL)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 EXTRA_COMPONENTS += ibDockBadge.js ibDockBadge.manifest
 else
 EXTRA_COMPONENTS += profileMigrator.js profileMigrator.manifest
 endif
 
deleted file mode 100644
--- a/im/content/jar.mn
+++ b/im/content/jar.mn
@@ -12,22 +12,18 @@ instantbird.jar:
 	content/instantbird/account.xul
 	content/instantbird/addbuddy.js
 	content/instantbird/addbuddy.xul
 	content/instantbird/blist.css
 	content/instantbird/blist.js
 *	content/instantbird/blist.xul
 	content/instantbird/buddy.xml
 	content/instantbird/buddytooltip.xml
-	content/instantbird/browserRequest.js
-	content/instantbird/browserRequest.xul
 	content/instantbird/contact.xml
 *	content/instantbird/conversation.xml
-	content/instantbird/convbrowser.xml
-	content/instantbird/conv.html
 	content/instantbird/conv.xml
 *	content/instantbird/credits.xhtml
 *	content/instantbird/engineManager.js
 *	content/instantbird/engineManager.xul
 	content/instantbird/extensions.js
 *	content/instantbird/extensions.xul
 	content/instantbird/extensions-discover.js
 	content/instantbird/extensions-discover.xul
--- a/im/installer/package-manifest.in
+++ b/im/installer/package-manifest.in
@@ -398,16 +398,19 @@
 @BINPATH@/icons/*.png
 #endif
 #endif
 
 ; [libpurple]
 @BINPATH@/@DLL_PREFIX@purple@DLL_SUFFIX@
 @BINPATH@/components/@DLL_PREFIX@purplexpcom@DLL_SUFFIX@
 @BINPATH@/components/purplexpcom.xpt
+
+; [chat]
+@BINPATH@/components/chat.xpt
 @BINPATH@/components/imCommands.js
 @BINPATH@/components/imCommands.manifest
 @BINPATH@/components/imContacts.js
 @BINPATH@/components/imContacts.manifest
 @BINPATH@/components/imConversations.js
 @BINPATH@/components/imConversations.manifest
 
 #ifdef XP_MACOSX
@@ -429,17 +432,16 @@
 @BINPATH@/components/gtalkOverrideProtocol.js
 @BINPATH@/components/overrideProtocols.manifest
 @BINPATH@/components/twitter.js
 @BINPATH@/components/twitter.manifest
 @BINPATH@/components/smileProtocolHandler.js
 @BINPATH@/components/smileProtocolHandler.manifest
 @BINPATH@/components/logger.js
 @BINPATH@/components/logger.manifest
-@BINPATH@/components/instantbird.xpt
 
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 @BINPATH@/@PREF_DIR@/all-instantbird.js
 @BINPATH@/@PREF_DIR@/purple-prefs.js
 @BINPATH@/@PREF_DIR@/channel-prefs.js
 #ifdef MOZ_SERVICES_SYNC
 @BINPATH@/@PREF_DIR@/services-sync.js
--- a/im/locales/Makefile.in
+++ b/im/locales/Makefile.in
@@ -103,16 +103,17 @@ endif
 endif
 
 clobber-%:
 	$(RM) -rf $(DIST)/xpi-stage/locale-$*
 
 libs-%:
 	$(NSINSTALL) -D $(DIST)/install
 	@$(MAKE) -C ../../mozilla/toolkit/locales libs-$* BOTH_MANIFESTS=1
+	@$(MAKE) -C ../../chat/locales libs-$* AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../purple/locales libs-$* AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) -C ../../mozilla/extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 	@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1
 	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
 
 ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
 MOZ_PKG_MAC_DSSTORE=$(_ABS_DIST)/branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(_ABS_DIST)/branding/background.png
--- a/im/modules/Makefile.in
+++ b/im/modules/Makefile.in
@@ -37,29 +37,21 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXTRA_JS_MODULES = \
-	ibInterruptions.jsm \
 	ibNotifications.jsm \
-	ibSounds.jsm \
-	imContentSink.jsm \
-	imServices.jsm \
-	imSmileys.jsm \
 	$(NULL)
 
 EXTRA_PP_JS_MODULES = \
 	ibCore.jsm \
-	hiddenWindow.jsm \
-	imThemes.jsm \
-	imTextboxUtils.jsm \
 	imWindows.jsm \
 	$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 EXTRA_JS_MODULES += ibWinJumpList.jsm
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/im/themes/jar.mn
+++ b/im/themes/jar.mn
@@ -5,17 +5,16 @@ instantbird.jar:
 % skin instantbird classic/1.0 %skin/classic/instantbird/ os=WINNT osversion<6
 % skin instantbird classic/1.0 %skin/classic/instantbird/ os!=WINNT
 % skin instantbird classic/1.0 %skin/classic/aero/instantbird/ os=WINNT osversion>=6
 #endif
 	skin/classic/instantbird/account.css
 *	skin/classic/instantbird/accounts.css
 	skin/classic/instantbird/alert.css
 % style chrome://global/content/alerts/alert.xul chrome://instantbird/skin/alert.css
-	skin/classic/instantbird/browserRequest.css
 *	skin/classic/instantbird/richlistbox.css
 *	skin/classic/instantbird/accountWizard.css
 	skin/classic/instantbird/available-16.png
 	skin/classic/instantbird/available.png
 	skin/classic/instantbird/away-16.png
 	skin/classic/instantbird/away.png
 	skin/classic/instantbird/idle-16.png
 	skin/classic/instantbird/idle.png
@@ -40,24 +39,16 @@ instantbird.jar:
 *	skin/classic/instantbird/engineManager.css
 *	skin/classic/instantbird/instantbird.css
 	skin/classic/instantbird/menus.css
 *	skin/classic/instantbird/viewlog.css
 	skin/classic/instantbird/newMessage.png
 	skin/classic/instantbird/expand.png
 	skin/classic/instantbird/collapse.png
 	skin/classic/instantbird/userIcon.png
-	skin/classic/instantbird/prpl-generic/icon32.png	(prpl/prpl-generic-32.png)
-	skin/classic/instantbird/prpl-generic/icon48.png	(prpl/prpl-generic-48.png)
-	skin/classic/instantbird/prpl-generic/icon.png		(prpl/prpl-generic.png)
-	skin/classic/instantbird/prpl-unknown/icon32.png	(prpl/prpl-unknown-32.png)
-	skin/classic/instantbird/prpl-unknown/icon48.png	(prpl/prpl-unknown-48.png)
-	skin/classic/instantbird/prpl-unknown/icon.png		(prpl/prpl-unknown.png)
-	skin/classic/instantbird/icons/secure.png               (icons/secure.png)
-	skin/classic/instantbird/icons/insecure.png             (icons/insecure.png)
 #ifdef XP_UNIX
 #ifdef XP_MACOSX
 	skin/classic/instantbird/preferences/Options.png        (preferences-pinstripe/Options.png)
 	skin/classic/instantbird/preferences/alwaysAsk.png      (preferences-pinstripe/alwaysAsk.png)
 	skin/classic/instantbird/preferences/application.png    (preferences-pinstripe/application.png)
 	skin/classic/instantbird/preferences/applications.css   (preferences-pinstripe/applications.css)
 	skin/classic/instantbird/preferences/preferences.css    (preferences-pinstripe/preferences.css)
 	skin/classic/instantbird/preferences/saveFile.png       (preferences-pinstripe/saveFile.png)
@@ -105,17 +96,16 @@ instantbird.jar:
 	skin/classic/instantbird/tabbrowser/tab-overflow-border.png	(tabbrowser-winstripe/tab-overflow-border.png)
 	skin/classic/instantbird/tabbrowser/tabDragIndicator.png	(tabbrowser-winstripe/tabDragIndicator.png)
 	skin/classic/instantbird/tabbrowser/mainwindow-dropdown-arrow.png	(tabbrowser-winstripe/mainwindow-dropdown-arrow.png)
 #endif
 #ifdef XP_WIN
 	skin/classic/aero/instantbird/account.css
 *	skin/classic/aero/instantbird/accounts.css		(accounts-aero.css)
 	skin/classic/aero/instantbird/alert.css
-	skin/classic/aero/instantbird/browserRequest.css
 *	skin/classic/aero/instantbird/richlistbox.css
 *	skin/classic/aero/instantbird/accountWizard.css
 	skin/classic/aero/instantbird/available-16.png
 	skin/classic/aero/instantbird/available.png
 	skin/classic/aero/instantbird/away-16.png
 	skin/classic/aero/instantbird/away.png
 	skin/classic/aero/instantbird/idle-16.png
 	skin/classic/aero/instantbird/idle.png
@@ -140,24 +130,16 @@ instantbird.jar:
 *	skin/classic/aero/instantbird/engineManager.css
 *	skin/classic/aero/instantbird/instantbird.css		(instantbird-aero.css)
 	skin/classic/aero/instantbird/menus.css
 *	skin/classic/aero/instantbird/viewlog.css
 	skin/classic/aero/instantbird/newMessage.png
 	skin/classic/aero/instantbird/expand.png
 	skin/classic/aero/instantbird/collapse.png
 	skin/classic/aero/instantbird/userIcon.png
-	skin/classic/aero/instantbird/prpl-generic/icon32.png   (prpl/prpl-generic-32.png)
-	skin/classic/aero/instantbird/prpl-generic/icon48.png   (prpl/prpl-generic-48.png)
-	skin/classic/aero/instantbird/prpl-generic/icon.png     (prpl/prpl-generic.png)
-	skin/classic/aero/instantbird/prpl-unknown/icon32.png   (prpl/prpl-unknown-32.png)
-	skin/classic/aero/instantbird/prpl-unknown/icon48.png   (prpl/prpl-unknown-48.png)
-	skin/classic/aero/instantbird/prpl-unknown/icon.png     (prpl/prpl-unknown.png)
-	skin/classic/aero/instantbird/icons/secure.png               (icons/secure.png)
-	skin/classic/aero/instantbird/icons/insecure.png             (icons/insecure.png)
 	skin/classic/aero/instantbird/preferences/Options.png        (preferences-winstripe/Options-aero.png)
 	skin/classic/aero/instantbird/preferences/alwaysAsk.png      (preferences-winstripe/alwaysAsk-aero.png)
 	skin/classic/aero/instantbird/preferences/application.png    (preferences-winstripe/application-aero.png)
 	skin/classic/aero/instantbird/preferences/applications.css   (preferences-winstripe/applications.css)
 	skin/classic/aero/instantbird/preferences/preferences.css    (preferences-winstripe/preferences.css)
 	skin/classic/aero/instantbird/preferences/saveFile.png       (preferences-winstripe/saveFile-aero.png)
 	skin/classic/aero/instantbird/preferences/mail.png           (preferences-winstripe/mail-aero.png)
 *	skin/classic/aero/instantbird/tabbrowser.css                            (tabbrowser-winstripe/tabbrowser.css)
@@ -183,24 +165,16 @@ instantbird.jar:
 % skin prpl-irc classic/1.0 %skin/classic/prpl/irc/
 	skin/classic/prpl/irc/icon32.png	(prpl/prpl-irc-32.png)
 	skin/classic/prpl/irc/icon48.png	(prpl/prpl-irc-48.png)
 	skin/classic/prpl/irc/icon.png		(prpl/prpl-irc.png)
 % skin prpl-jabber classic/1.0 %skin/classic/prpl/jabber/
 	skin/classic/prpl/jabber/icon32.png	(prpl/prpl-jabber-32.png)
 	skin/classic/prpl/jabber/icon48.png	(prpl/prpl-jabber-48.png)
 	skin/classic/prpl/jabber/icon.png	(prpl/prpl-jabber.png)
-% skin prpl-gtalk classic/1.0 %skin/classic/prpl/gtalk/
-	skin/classic/prpl/gtalk/icon32.png	(prpl/prpl-gtalk-32.png)
-	skin/classic/prpl/gtalk/icon48.png	(prpl/prpl-gtalk-48.png)
-	skin/classic/prpl/gtalk/icon.png	(prpl/prpl-gtalk.png)
-% skin prpl-facebook classic/1.0 %skin/classic/prpl/facebook/
-	skin/classic/prpl/facebook/icon32.png	(prpl/prpl-facebook-32.png)
-	skin/classic/prpl/facebook/icon48.png	(prpl/prpl-facebook-48.png)
-	skin/classic/prpl/facebook/icon.png	(prpl/prpl-facebook.png)
 % skin prpl-msn classic/1.0 %skin/classic/prpl/msn/
 	skin/classic/prpl/msn/icon32.png	(prpl/prpl-msn-32.png)
 	skin/classic/prpl/msn/icon48.png	(prpl/prpl-msn-48.png)
 	skin/classic/prpl/msn/icon.png		(prpl/prpl-msn.png)
 % skin prpl-myspace classic/1.0 %skin/classic/prpl/myspace/
 	skin/classic/prpl/myspace/icon32.png	(prpl/prpl-myspace-32.png)
 	skin/classic/prpl/myspace/icon48.png	(prpl/prpl-myspace-48.png)
 	skin/classic/prpl/myspace/icon.png	(prpl/prpl-myspace.png)
@@ -218,20 +192,16 @@ instantbird.jar:
 % skin prpl-meanwhile classic/1.0 %skin/classic/prpl/meanwhile/
 	skin/classic/prpl/meanwhile/icon32.png	(prpl/prpl-meanwhile-32.png)
 	skin/classic/prpl/meanwhile/icon48.png	(prpl/prpl-meanwhile-48.png)
 	skin/classic/prpl/meanwhile/icon.png	(prpl/prpl-meanwhile.png)
 % skin prpl-simple classic/1.0 %skin/classic/prpl/simple/
 	skin/classic/prpl/simple/icon32.png	(prpl/prpl-simple-32.png)
 	skin/classic/prpl/simple/icon48.png	(prpl/prpl-simple-48.png)
 	skin/classic/prpl/simple/icon.png	(prpl/prpl-simple.png)
-% skin prpl-twitter classic/1.0 %skin/classic/prpl/twitter/
-	skin/classic/prpl/twitter/icon32.png	(prpl/prpl-twitter-32.png)
-	skin/classic/prpl/twitter/icon48.png	(prpl/prpl-twitter-48.png)
-	skin/classic/prpl/twitter/icon.png	(prpl/prpl-twitter.png)
 % skin prpl-yahoo classic/1.0 %skin/classic/prpl/yahoo/
 % skin prpl-yahoojp classic/1.0 %skin/classic/prpl/yahoo/
 	skin/classic/prpl/yahoo/icon32.png	(prpl/prpl-yahoo-32.png)
 	skin/classic/prpl/yahoo/icon48.png	(prpl/prpl-yahoo-48.png)
 	skin/classic/prpl/yahoo/icon.png	(prpl/prpl-yahoo.png)
 % skin prpl-bilboed-netsoul classic/1.0 %skin/classic/prpl/bilboed-netsoul/
 	skin/classic/prpl/bilboed-netsoul/icon32.png	(prpl/prpl-bilboed-netsoul-32.png)
 	skin/classic/prpl/bilboed-netsoul/icon48.png	(prpl/prpl-bilboed-netsoul-48.png)