mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-781 - One to one conversation in group chat room is using a single user.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@8658 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-06-28 18:13:58 +00:00
committed by derek
parent 633026af22
commit a931c93572
2 changed files with 60 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
build/installer/spark.aip
View File

@ -8,10 +8,10 @@
<ROW Property="BannerBitmap" Value="default_banner.bmp" Type="1"/>
<ROW Property="DialogBitmap" Value="default_dialog.bmp" Type="1"/>
<ROW Property="Manufacturer" Value="Jive Software" ValueLocId="*"/>
<ROW Property="ProductCode" Value="1033:{783E2201-8AC7-44F1-9418-F732A6B96F82} "/>
<ROW Property="ProductCode" Value="1033:{EF548870-A19D-46E3-886C-272B56EAE210} "/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="Spark" ValueLocId="*"/>
<ROW Property="ProductVersion" Value="2.5.3"/>
<ROW Property="ProductVersion" Value="2.5.4"/>
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
<ROW Property="UpgradeCode" Value="{FD8D7ADD-E933-4DEA-81BA-2F4C0FF8B22E}"/>
</COMPONENT>
@ -23,7 +23,17 @@
<ROW Directory="bin_DIR" Directory_Parent="APPDIR" DefaultDir="bin"/>
<ROW Directory="documentation_DIR" Directory_Parent="APPDIR" DefaultDir="docume~1|documentation"/>
<ROW Directory="emoticons_DIR" Directory_Parent="xtra_DIR" DefaultDir="emotic~1|emoticons"/>
<ROW Directory="fastpath_DIR" Directory_Parent="plugins_DIR" DefaultDir="fastpath"/>
<ROW Directory="idlelinux_DIR" Directory_Parent="plugins_DIR" DefaultDir="idleli~1|idlelinux"/>
<ROW Directory="images_DIR" Directory_Parent="documentation_DIR" DefaultDir="images"/>
<ROW Directory="jingle_DIR" Directory_Parent="plugins_DIR" DefaultDir="jingle"/>
<ROW Directory="jniwrapper_DIR" Directory_Parent="plugins_DIR" DefaultDir="jniwra~1|jniwrapper"/>
<ROW Directory="lib_1_DIR" Directory_Parent="fastpath_DIR" DefaultDir="lib"/>
<ROW Directory="lib_2_DIR" Directory_Parent="idlelinux_DIR" DefaultDir="lib"/>
<ROW Directory="lib_3_DIR" Directory_Parent="jingle_DIR" DefaultDir="lib"/>
<ROW Directory="lib_4_DIR" Directory_Parent="jniwrapper_DIR" DefaultDir="lib"/>
<ROW Directory="lib_5_DIR" Directory_Parent="sparkphone_DIR" DefaultDir="lib"/>
<ROW Directory="lib_6_DIR" Directory_Parent="spelling_plugin_DIR" DefaultDir="lib"/>
<ROW Directory="lib_DIR" Directory_Parent="APPDIR" DefaultDir="lib"/>
<ROW Directory="linux_DIR" Directory_Parent="lib_DIR" DefaultDir="linux"/>
<ROW Directory="logs_DIR" Directory_Parent="APPDIR" DefaultDir="logs"/>
@ -31,6 +41,8 @@
<ROW Directory="plugins_DIR" Directory_Parent="APPDIR" DefaultDir="plugins"/>
<ROW Directory="resources_DIR" Directory_Parent="APPDIR" DefaultDir="resour~1|resources"/>
<ROW Directory="sounds_DIR" Directory_Parent="resources_DIR" DefaultDir="sounds"/>
<ROW Directory="sparkphone_DIR" Directory_Parent="plugins_DIR" DefaultDir="sparkp~1|sparkphone"/>
<ROW Directory="spelling_plugin_DIR" Directory_Parent="plugins_DIR" DefaultDir="spelli~1|spelling-plugin"/>
<ROW Directory="windows_DIR" Directory_Parent="lib_DIR" DefaultDir="windows"/>
<ROW Directory="xtra_DIR" Directory_Parent="APPDIR" DefaultDir="xtra"/>
</COMPONENT>
@ -48,10 +60,13 @@
<ROW Component="bell.wav" ComponentId="{EF2B5A55-1F75-4FD9-AA4A-D74E2E68E693}" Directory_="sounds_DIR" Attributes="0" KeyPath="bell.wav" FullKeyPath="APPDIR\resources\sounds"/>
<ROW Component="builder.jar" ComponentId="{795A80F8-B5ED-4AD1-936D-C899D0372A3D}" Directory_="documentation_DIR" Attributes="0" KeyPath="builder.jar" FullKeyPath="APPDIR\documentation"/>
<ROW Component="error.log" ComponentId="{70AD4F3B-9CDF-4026-AA4D-5F36707989ED}" Directory_="logs_DIR" Attributes="0" KeyPath="error.log" FullKeyPath="APPDIR\logs"/>
<ROW Component="fastpath" ComponentId="{07F6C6DF-36F2-47C6-AC05-E1560A0667A7}" Directory_="fastpath_DIR" Attributes="0"/>
<ROW Component="fastpath.jar" ComponentId="{503F9197-8958-4BEC-822A-94E0E6E1D4C4}" Directory_="plugins_DIR" Attributes="0" KeyPath="jingle.jar" FullKeyPath="APPDIR\plugins"/>
<ROW Component="idlelinux" ComponentId="{86CAADD9-EFF0-4FF7-BECC-A372948D50DA}" Directory_="idlelinux_DIR" Attributes="0"/>
<ROW Component="jdic.dll" ComponentId="{17D3EE65-D6C1-467E-B25A-676C0EEFAD93}" Directory_="windows_DIR" Attributes="0" KeyPath="jdic.dll" FullKeyPath="APPDIR\lib\windows\jdic.dll"/>
<ROW Component="jdic.jar" ComponentId="{8964186C-0874-41F6-85D3-4EA5BF7004B7}" Directory_="windows_DIR" Attributes="0" KeyPath="jdic.jar" FullKeyPath="APPDIR\lib\windows"/>
<ROW Component="jdic.jar_1" ComponentId="{1D37B8D5-5F18-448B-9064-37A75574A597}" Directory_="linux_DIR" Attributes="0" KeyPath="jdic.jar_1" FullKeyPath="APPDIR\lib\linux"/>
<ROW Component="jingle" ComponentId="{EEA0966F-F717-4934-893C-F51D2F59BAD2}" Directory_="jingle_DIR" Attributes="0"/>
<ROW Component="jmacm.dll" ComponentId="{29DC57BF-EAF7-448D-86F5-68356EE871A4}" Directory_="windows_DIR" Attributes="0" KeyPath="jmacm.dll" FullKeyPath="APPDIR\lib\windows\jmacm.dll"/>
<ROW Component="jmam.dll" ComponentId="{E76A0AD6-77BA-429D-8702-79F8EF8DD596}" Directory_="windows_DIR" Attributes="0" KeyPath="jmam.dll" FullKeyPath="APPDIR\lib\windows\jmam.dll"/>
<ROW Component="jmcvid.dll" ComponentId="{663FFC6A-6886-47E9-892A-25C0181FFC9D}" Directory_="windows_DIR" Attributes="0" KeyPath="jmcvid.dll" FullKeyPath="APPDIR\lib\windows\jmcvid.dll"/>
@ -73,14 +88,23 @@
<ROW Component="jmvfw.dll" ComponentId="{74EFBC0E-CD17-4FC0-8B9A-59698E9066D7}" Directory_="windows_DIR" Attributes="0" KeyPath="jmvfw.dll" FullKeyPath="APPDIR\lib\windows\jmvfw.dll"/>
<ROW Component="jmvh263.dll" ComponentId="{DCAF46F2-9CCF-4032-A38E-3782372EE08B}" Directory_="windows_DIR" Attributes="0" KeyPath="jmvh263.dll" FullKeyPath="APPDIR\lib\windows\jmvh263.dll"/>
<ROW Component="jniwrap.dll" ComponentId="{CB50B6AC-1A6C-4603-A7E9-5FA0699A8487}" Directory_="resources_DIR" Attributes="0" KeyPath="jniwrap.dll" FullKeyPath="APPDIR\resources\jniwrap.dll"/>
<ROW Component="jniwrapper" ComponentId="{2E71B94A-7D4E-4969-800B-FA4F05BD7972}" Directory_="jniwrapper_DIR" Attributes="0"/>
<ROW Component="jsound.dll" ComponentId="{6C41EA93-7D81-4295-AB49-1BC0F5B9B420}" Directory_="windows_DIR" Attributes="0" KeyPath="jsound.dll" FullKeyPath="APPDIR\lib\windows\jsound.dll"/>
<ROW Component="lib" ComponentId="{F9686CAE-560E-4ECA-939F-759670EC4F6D}" Directory_="lib_1_DIR" Attributes="0"/>
<ROW Component="lib_1" ComponentId="{816A3F21-3F18-49AE-9C0A-0392217C9389}" Directory_="lib_2_DIR" Attributes="0"/>
<ROW Component="lib_2" ComponentId="{8C14972E-8024-4F78-9DAA-A0C62844CD5C}" Directory_="lib_3_DIR" Attributes="0"/>
<ROW Component="lib_3" ComponentId="{59280840-FFE3-48F6-8EED-4ADD11CEAAB5}" Directory_="lib_4_DIR" Attributes="0"/>
<ROW Component="lib_4" ComponentId="{33A08507-48DC-4B64-8163-65410C11427C}" Directory_="lib_5_DIR" Attributes="0"/>
<ROW Component="lib_5" ComponentId="{D0497999-5C3C-45C6-93E2-525CBC8CFBA6}" Directory_="lib_6_DIR" Attributes="0"/>
<ROW Component="sparkphone" ComponentId="{E9FEA1B4-8CA7-40D5-9AEC-7F81988BE6F2}" Directory_="sparkphone_DIR" Attributes="0"/>
<ROW Component="spelling_plugin" ComponentId="{1DD3D508-6FF3-4613-8CF5-010B178E746A}" Directory_="spelling_plugin_DIR" Attributes="0"/>
<ROW Component="startup.bat" ComponentId="{FE572BF0-B831-45A0-9011-65560A86D090}" Directory_="bin_DIR" Attributes="0" KeyPath="startup.bat" FullKeyPath="APPDIR\bin"/>
<ROW Component="systeminfo.dll" ComponentId="{82FE331B-ACA1-4660-98B0-B1D90268BF48}" Directory_="resources_DIR" Attributes="0" KeyPath="systeminfo.dll" FullKeyPath="APPDIR\resources\systeminfo.dll"/>
<ROW Component="tray.dll" ComponentId="{9111ECAE-92BB-4C1C-BFBF-BF4A76C93CC1}" Directory_="windows_DIR" Attributes="0" KeyPath="tray.dll" FullKeyPath="APPDIR\lib\windows\tray.dll"/>
<ROW Component="xtra" ComponentId="{50DC827D-F369-41B1-A8BD-426956FA71FB}" Directory_="xtra_DIR" Attributes="0"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="startup.bat builder.jar banner_spark.gif activation.jar IeEmbed.exe jdic.dll jdic.jar MozEmbed.exe tray.dll error.log fastpath.jar Info.plist jniwrap.dll bell.wav Spark.exe Your_Product.exe Spark jmacm.dll jmam.dll jmcvid.dll jmdaud.dll jmdaudc.dll jmddraw.dll jmfjawt.dll jmg723.dll jmgdi.dll jmgsm.dll jmh263enc.dll jmjpeg.dll jmmci.dll jmmpa.dll jmmpegv.dll jmutil.dll jmvcm.dll jmvfw.dll jmvh263.dll xtra jmh261.dll jsound.dll systeminfo.dll Default.adiumemoticonset.zip jdic.jar_1 JavaSoundStream.fix.jar"/>
<ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="startup.bat builder.jar banner_spark.gif activation.jar IeEmbed.exe jdic.dll jdic.jar MozEmbed.exe tray.dll error.log fastpath.jar Info.plist jniwrap.dll bell.wav Spark.exe Your_Product.exe Spark jmacm.dll jmam.dll jmcvid.dll jmdaud.dll jmdaudc.dll jmddraw.dll jmfjawt.dll jmg723.dll jmgdi.dll jmgsm.dll jmh263enc.dll jmjpeg.dll jmmci.dll jmmpa.dll jmmpegv.dll jmutil.dll jmvcm.dll jmvfw.dll jmvh263.dll xtra jmh261.dll jsound.dll systeminfo.dll Default.adiumemoticonset.zip jdic.jar_1 JavaSoundStream.fix.jar lib fastpath lib_1 idlelinux lib_2 jingle lib_3 jniwrapper lib_4 sparkphone lib_5 spelling_plugin"/>
<ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
@ -96,6 +120,7 @@
<ROW File="Spark.exe" Component_="Spark.exe" FileName="Spark.exe" Attributes="0" SourcePath="&lt;aijclw.exe&gt;" SelfReg="false" Sequence="32"/>
<ROW File="Your_Product.exe" Component_="Your_Product.exe" FileName="starter.exe" Attributes="0" SourcePath="&lt;aijcl.exe&gt;" SelfReg="false" Sequence="33"/>
<ROW File="activation.jar" Component_="activation.jar" FileName="activa~1.jar|activation.jar" Attributes="0" SourcePath="..\..\target\build\lib\activation.jar" SelfReg="false" Sequence="13"/>
<ROW File="asterisk_im_client.jar" Component_="activation.jar" FileName="asteri~1.jar|asterisk-im-client.jar" Attributes="0" SourcePath="..\..\target\build\lib\asterisk-im-client.jar" SelfReg="false" Sequence="89"/>
<ROW File="asterisk_im_client.jar.pack" Component_="activation.jar" FileName="asteri~1.pac|asterisk-im-client.jar.pack" Attributes="0" SourcePath="..\..\target\build\lib\asterisk-im-client.jar.pack" SelfReg="false" Sequence="73"/>
<ROW File="banner_spark.gif" Component_="banner_spark.gif" FileName="banner~1.gif|banner-spark.gif" Attributes="0" SourcePath="..\..\target\build\documentation\images\banner-spark.gif" SelfReg="false" Sequence="4"/>
<ROW File="banner_spring.gif" Component_="banner_spark.gif" FileName="banner~2.gif|banner-spring.gif" Attributes="0" SourcePath="..\..\target\build\documentation\images\banner-spring.gif" SelfReg="false" Sequence="5"/>
@ -108,9 +133,10 @@
<ROW File="contact_list.png" Component_="banner_spark.gif" FileName="contac~1.png|contact-list.png" Attributes="0" SourcePath="..\..\target\build\documentation\images\contact-list.png" SelfReg="false" Sequence="7"/>
<ROW File="dom4j.jar" Component_="activation.jar" FileName="dom4j.jar" Attributes="0" SourcePath="..\..\target\build\lib\dom4j.jar" SelfReg="false" Sequence="15"/>
<ROW File="error.log" Component_="error.log" FileName="error.log" Attributes="0" SourcePath="..\..\target\build\logs\error.log" SelfReg="false" Sequence="22"/>
<ROW File="fastpath.jar" Component_="fastpath.jar" FileName="fastpath.jar" Attributes="0" SourcePath="..\..\target\build\plugins\fastpath.jar" SelfReg="false" Sequence="100"/>
<ROW File="fastpath.jar.pack" Component_="fastpath.jar" FileName="fastpa~1.pac|fastpath.jar.pack" Attributes="0" SourcePath="..\..\target\build\plugins\fastpath.jar.pack" SelfReg="false" Sequence="85"/>
<ROW File="i4jruntime.jar" Component_="activation.jar" FileName="i4jrun~1.jar|i4jruntime.jar" Attributes="0" SourcePath="..\..\target\build\lib\i4jruntime.jar" SelfReg="false" Sequence="16"/>
<ROW File="idlelinux.jar.pack" Component_="fastpath.jar" FileName="idleli~1.pac|idlelinux.jar.pack" Attributes="0" SourcePath="..\..\target\build\plugins\idlelinux.jar.pack" SelfReg="false" Sequence="86"/>
<ROW File="idlelinux.jar" Component_="fastpath.jar" FileName="idleli~1.jar|idlelinux.jar" Attributes="0" SourcePath="..\..\target\build\plugins\idlelinux.jar" SelfReg="false" Sequence="101"/>
<ROW File="incoming.wav" Component_="bell.wav" FileName="incoming.wav" Attributes="0" SourcePath="..\..\target\build\resources\sounds\incoming.wav" SelfReg="false" Sequence="28"/>
<ROW File="jdic.dll" Component_="jdic.dll" FileName="jdic.dll" Attributes="0" SourcePath="..\..\target\build\lib\windows\jdic.dll" SelfReg="false" Sequence="18"/>
<ROW File="jdic.jar" Component_="jdic.jar" FileName="jdic.jar" Attributes="0" SourcePath="..\..\target\build\lib\windows\jdic.jar" SelfReg="false" Sequence="19"/>
@ -141,7 +167,8 @@
<ROW File="jmvh263.dll" Component_="jmvh263.dll" FileName="jmvh263.dll" Attributes="0" SourcePath="..\..\target\build\lib\windows\jmvh263.dll" SelfReg="false" Sequence="53"/>
<ROW File="jniwrap.dll" Component_="jniwrap.dll" FileName="jniwrap.dll" Attributes="0" SourcePath="..\..\target\build\resources\jniwrap.dll" SelfReg="false" Sequence="24"/>
<ROW File="jniwrap.lic" Component_="Info.plist" FileName="jniwrap.lic" Attributes="0" SourcePath="..\..\target\build\resources\jniwrap.lic" SelfReg="false" Sequence="25"/>
<ROW File="jniwrapper.jar.pack" Component_="fastpath.jar" FileName="jniwra~1.pac|jniwrapper.jar.pack" Attributes="0" SourcePath="..\..\target\build\plugins\jniwrapper.jar.pack" SelfReg="false" Sequence="87"/>
<ROW File="jniwrapper.jar" Component_="fastpath.jar" FileName="jniwra~1.jar|jniwrapper.jar" Attributes="0" SourcePath="..\..\target\build\plugins\jniwrapper.jar" SelfReg="false" Sequence="102"/>
<ROW File="jniwrapper.jar.pack" Component_="fastpath.jar" FileName="jniwra~1.pac|jniwrapper.jar.pack" Attributes="0" SourcePath="..\..\target\build\plugins\jniwrapper.jar.pack" SelfReg="false" Sequence="86"/>
<ROW File="jsound.dll" Component_="jsound.dll" FileName="jsound.dll" Attributes="0" SourcePath="..\..\target\build\lib\windows\jsound.dll" SelfReg="false" Sequence="57"/>
<ROW File="libSystemUtilities.jnilib" Component_="JavaSoundStream.fix.jar" FileName="libSys~1.jni|libSystemUtilities.jnilib" Attributes="0" SourcePath="..\..\target\build\lib\mac\libSystemUtilities.jnilib" SelfReg="false" Sequence="84"/>
<ROW File="libjdic.so" Component_="jdic.jar_1" FileName="libjdic.so" Attributes="0" SourcePath="..\..\target\build\lib\linux\libjdic.so" SelfReg="false" Sequence="66"/>
@ -152,26 +179,38 @@
<ROW File="mozembed_linux_gtk1.2" Component_="jdic.jar_1" FileName="mozemb~1.2|mozembed-linux-gtk1.2" Attributes="0" SourcePath="..\..\target\build\lib\linux\mozembed-linux-gtk1.2" SelfReg="false" Sequence="70"/>
<ROW File="outgoing.wav" Component_="bell.wav" FileName="outgoing.wav" Attributes="0" SourcePath="..\..\target\build\resources\sounds\outgoing.wav" SelfReg="false" Sequence="29"/>
<ROW File="presence_changed.wav" Component_="bell.wav" FileName="presen~1.wav|presence_changed.wav" Attributes="0" SourcePath="..\..\target\build\resources\sounds\presence_changed.wav" SelfReg="false" Sequence="30"/>
<ROW File="smack.jar" Component_="activation.jar" FileName="smack.jar" Attributes="0" SourcePath="..\..\target\build\lib\smack.jar" SelfReg="false" Sequence="90"/>
<ROW File="smack.jar.pack" Component_="activation.jar" FileName="smackj~1.pac|smack.jar.pack" Attributes="0" SourcePath="..\..\target\build\lib\smack.jar.pack" SelfReg="false" Sequence="74"/>
<ROW File="smackx.jar" Component_="activation.jar" FileName="smackx.jar" Attributes="0" SourcePath="..\..\target\build\lib\smackx.jar" SelfReg="false" Sequence="92"/>
<ROW File="smackx.jar.pack" Component_="activation.jar" FileName="smackx~2.pac|smackx.jar.pack" Attributes="0" SourcePath="..\..\target\build\lib\smackx.jar.pack" SelfReg="false" Sequence="76"/>
<ROW File="smackx_debug.jar" Component_="activation.jar" FileName="smackx~1.jar|smackx-debug.jar" Attributes="0" SourcePath="..\..\target\build\lib\smackx-debug.jar" SelfReg="false" Sequence="91"/>
<ROW File="smackx_debug.jar.pack" Component_="activation.jar" FileName="smackx~1.pac|smackx-debug.jar.pack" Attributes="0" SourcePath="..\..\target\build\lib\smackx-debug.jar.pack" SelfReg="false" Sequence="75"/>
<ROW File="spark.jar" Component_="activation.jar" FileName="spark.jar" Attributes="0" SourcePath="..\..\target\build\lib\spark.jar" SelfReg="false" Sequence="93"/>
<ROW File="spark.jar.pack" Component_="activation.jar" FileName="sparkj~1.pac|spark.jar.pack" Attributes="0" SourcePath="..\..\target\build\lib\spark.jar.pack" SelfReg="false" Sequence="77"/>
<ROW File="sparkEmoticonSet.zip" Component_="Default.adiumemoticonset.zip" FileName="sparkE~1.zip|sparkEmoticonSet.zip" Attributes="0" SourcePath="..\..\target\build\xtra\emoticons\sparkEmoticonSet.zip" SelfReg="false" Sequence="63"/>
<ROW File="sparkphone.jar.pack" Component_="fastpath.jar" FileName="sparkp~1.pac|sparkphone.jar.pack" Attributes="0" SourcePath="..\..\target\build\plugins\sparkphone.jar.pack" SelfReg="false" Sequence="88"/>
<ROW File="sparkphone.jar" Component_="fastpath.jar" FileName="sparkp~1.jar|sparkphone.jar" Attributes="0" SourcePath="..\..\target\build\plugins\sparkphone.jar" SelfReg="false" Sequence="103"/>
<ROW File="sparkphone.jar.pack" Component_="fastpath.jar" FileName="sparkp~1.pac|sparkphone.jar.pack" Attributes="0" SourcePath="..\..\target\build\plugins\sparkphone.jar.pack" SelfReg="false" Sequence="87"/>
<ROW File="sparkplug_dev_guide.html" Component_="builder.jar" FileName="sparkp~1.htm|sparkplug_dev_guide.html" Attributes="0" SourcePath="..\..\target\build\documentation\sparkplug_dev_guide.html" SelfReg="false" Sequence="11"/>
<ROW File="spelling_plugin.jar.pack" Component_="fastpath.jar" FileName="spelli~1.pac|spelling-plugin.jar.pack" Attributes="0" SourcePath="..\..\target\build\plugins\spelling-plugin.jar.pack" SelfReg="false" Sequence="89"/>
<ROW File="spelling_plugin.jar" Component_="fastpath.jar" FileName="spelli~1.jar|spelling-plugin.jar" Attributes="0" SourcePath="..\..\target\build\plugins\spelling-plugin.jar" SelfReg="false" Sequence="104"/>
<ROW File="spelling_plugin.jar.pack" Component_="fastpath.jar" FileName="spelli~1.pac|spelling-plugin.jar.pack" Attributes="0" SourcePath="..\..\target\build\plugins\spelling-plugin.jar.pack" SelfReg="false" Sequence="88"/>
<ROW File="startup.bat" Component_="startup.bat" FileName="startup.bat" Attributes="0" SourcePath="..\..\target\build\bin\startup.bat" SelfReg="false" Sequence="1"/>
<ROW File="startup.jar" Component_="activation.jar" FileName="startup.jar" Attributes="0" SourcePath="..\..\target\build\lib\startup.jar" SelfReg="false" Sequence="54"/>
<ROW File="startup.sh" Component_="Info.plist" FileName="startup.sh" Attributes="0" SourcePath="..\..\target\build\resources\startup.sh" SelfReg="false" Sequence="31"/>
<ROW File="startup.sh_1" Component_="startup.bat" FileName="startup.sh" Attributes="0" SourcePath="..\..\target\build\bin\startup.sh" SelfReg="false" Sequence="34"/>
<ROW File="style.css" Component_="builder.jar" FileName="style.css" Attributes="0" SourcePath="..\..\target\build\documentation\style.css" SelfReg="false" Sequence="12"/>
<ROW File="swingx.jar" Component_="activation.jar" FileName="swingx.jar" Attributes="0" SourcePath="..\..\target\build\lib\swingx.jar" SelfReg="false" Sequence="94"/>
<ROW File="swingx.jar.pack" Component_="activation.jar" FileName="swingx~1.pac|swingx.jar.pack" Attributes="0" SourcePath="..\..\target\build\lib\swingx.jar.pack" SelfReg="false" Sequence="78"/>
<ROW File="synthetica.jar" Component_="activation.jar" FileName="synthe~1.jar|synthetica.jar" Attributes="0" SourcePath="..\..\target\build\lib\synthetica.jar" SelfReg="false" Sequence="95"/>
<ROW File="synthetica.jar.pack" Component_="activation.jar" FileName="synthe~1.pac|synthetica.jar.pack" Attributes="0" SourcePath="..\..\target\build\lib\synthetica.jar.pack" SelfReg="false" Sequence="79"/>
<ROW File="syntheticaBlueMoon.jar" Component_="activation.jar" FileName="synthe~2.jar|syntheticaBlueMoon.jar" Attributes="0" SourcePath="..\..\target\build\lib\syntheticaBlueMoon.jar" SelfReg="false" Sequence="96"/>
<ROW File="syntheticaBlueMoon.jar.pack" Component_="activation.jar" FileName="synthe~2.pac|syntheticaBlueMoon.jar.pack" Attributes="0" SourcePath="..\..\target\build\lib\syntheticaBlueMoon.jar.pack" SelfReg="false" Sequence="80"/>
<ROW File="systeminfo.dll" Component_="systeminfo.dll" FileName="system~1.dll|systeminfo.dll" Attributes="0" SourcePath="..\..\target\build\resources\systeminfo.dll" SelfReg="false" Sequence="59"/>
<ROW File="systeminfo.jar" Component_="activation.jar" FileName="system~1.jar|systeminfo.jar" Attributes="0" SourcePath="..\..\target\build\lib\systeminfo.jar" SelfReg="false" Sequence="97"/>
<ROW File="systeminfo.jar.pack" Component_="activation.jar" FileName="system~1.pac|systeminfo.jar.pack" Attributes="0" SourcePath="..\..\target\build\lib\systeminfo.jar.pack" SelfReg="false" Sequence="81"/>
<ROW File="tray.dll" Component_="tray.dll" FileName="tray.dll" Attributes="0" SourcePath="..\..\target\build\lib\windows\tray.dll" SelfReg="false" Sequence="21"/>
<ROW File="xpp.jar" Component_="activation.jar" FileName="xpp.jar" Attributes="0" SourcePath="..\..\target\build\lib\xpp.jar" SelfReg="false" Sequence="98"/>
<ROW File="xpp.jar.pack" Component_="activation.jar" FileName="xppjar~1.pac|xpp.jar.pack" Attributes="0" SourcePath="..\..\target\build\lib\xpp.jar.pack" SelfReg="false" Sequence="82"/>
<ROW File="xstream.jar" Component_="activation.jar" FileName="xstream.jar" Attributes="0" SourcePath="..\..\target\build\lib\xstream.jar" SelfReg="false" Sequence="99"/>
<ROW File="xstream.jar.pack" Component_="activation.jar" FileName="xstrea~1.pac|xstream.jar.pack" Attributes="0" SourcePath="..\..\target\build\lib\xstream.jar.pack" SelfReg="false" Sequence="83"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
@ -203,6 +242,18 @@
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
<ROW Directory_="xtra_DIR" Component_="xtra"/>
<ROW Directory_="lib_1_DIR" Component_="lib"/>
<ROW Directory_="fastpath_DIR" Component_="fastpath"/>
<ROW Directory_="lib_2_DIR" Component_="lib_1"/>
<ROW Directory_="idlelinux_DIR" Component_="idlelinux"/>
<ROW Directory_="lib_3_DIR" Component_="lib_2"/>
<ROW Directory_="jingle_DIR" Component_="jingle"/>
<ROW Directory_="lib_4_DIR" Component_="lib_3"/>
<ROW Directory_="jniwrapper_DIR" Component_="jniwrapper"/>
<ROW Directory_="lib_5_DIR" Component_="lib_4"/>
<ROW Directory_="sparkphone_DIR" Component_="sparkphone"/>
<ROW Directory_="lib_6_DIR" Component_="lib_5"/>
<ROW Directory_="spelling_plugin_DIR" Component_="spelling_plugin"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
<ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>

4
src/java/org/jivesoftware/spark/ui/rooms/ChatRoomImpl.java
View File

@ -16,6 +16,7 @@ import org.jivesoftware.smack.Roster;
import org.jivesoftware.smack.RosterEntry;
import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.filter.AndFilter;
import org.jivesoftware.smack.filter.FromMatchesFilter;
import org.jivesoftware.smack.filter.OrFilter;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.PacketTypeFilter;
@ -33,7 +34,6 @@ import org.jivesoftware.spark.ui.ChatRoom;
import org.jivesoftware.spark.ui.ChatRoomButton;
import org.jivesoftware.spark.ui.ContactItem;
import org.jivesoftware.spark.ui.ContactList;
import org.jivesoftware.spark.ui.FromJIDFilter;
import org.jivesoftware.spark.ui.MessageEventListener;
import org.jivesoftware.spark.ui.RosterDialog;
import org.jivesoftware.spark.ui.VCardPanel;
@ -109,7 +109,7 @@ public class ChatRoomImpl extends ChatRoom {
loadHistory();
// Register PacketListeners
PacketFilter fromFilter = new FromJIDFilter(participantJID);
PacketFilter fromFilter = new FromMatchesFilter(participantJID);
PacketFilter orFilter = new OrFilter(new PacketTypeFilter(Presence.class), new PacketTypeFilter(Message.class));
PacketFilter andFilter = new AndFilter(orFilter, fromFilter);