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

1) Update fastpath.

Browse Source 
2) Update JNIWrapper.

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@6958 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-02-05 18:41:06 +00:00
committed by derek
parent ea8d619580
commit 10181c89b7
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
build/projects/Spark.iml
View File

@ -97,7 +97,9 @@
<root url="jar://$MODULE_DIR$/../lib/dist/smackx.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
<SOURCES>
<root url="file://$MODULE_DIR$/../../../smack/source" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
@ -169,7 +171,9 @@
<root url="jar://$MODULE_DIR$/../lib/dist/smack.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
<SOURCES>
<root url="file://$MODULE_DIR$/../../../smack/source" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
@ -190,15 +194,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../lib/dist/syntheticaBlackMoon.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library" exported="">
<library>
<CLASSES>

BIN
src/commercial/fastpath.jar
View File

Binary file not shown.

BIN
src/commercial/jniwrapper.jar
View File

Binary file not shown.

5
src/java/org/jivesoftware/spark/ui/ChatContainer.java
View File

@ -1039,7 +1039,10 @@ public class ChatContainer extends SparkTabbedPane implements MessageListener, C
if (room instanceof ChatRoomImpl) {
final ChatRoomImpl chatRoomImpl = (ChatRoomImpl)room;
if (!chatRoomImpl.isIconHandler()) {
if(chatRoomImpl.getAlternativeIcon() != null){
tab.setIcon(chatRoomImpl.getAlternativeIcon());
}
else if (!chatRoomImpl.isIconHandler()) {
Presence presence = chatRoomImpl.getPresence();
Icon icon = SparkManager.getUserManager().getTabIconForPresence(presence);
tab.setIcon(icon);