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

Fix duplicate broadcasts.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@9235 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-09-28 16:46:02 +00:00
committed by derek
parent d522cc5fda
commit 252dfd4794
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,10 +47,6 @@ import org.jivesoftware.sparkimpl.profile.VCardManager;
import org.jivesoftware.sparkimpl.settings.local.LocalPreferences; import org.jivesoftware.sparkimpl.settings.local.LocalPreferences;
import org.jivesoftware.sparkimpl.settings.local.SettingsManager; import org.jivesoftware.sparkimpl.settings.local.SettingsManager;
import javax.swing.Icon;
import javax.swing.SwingUtilities;
import javax.swing.event.DocumentEvent;
import java.awt.GridBagConstraints; import java.awt.GridBagConstraints;
import java.awt.Insets; import java.awt.Insets;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
@ -63,6 +59,10 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.TimerTask; import java.util.TimerTask;
import javax.swing.Icon;
import javax.swing.SwingUtilities;
import javax.swing.event.DocumentEvent;
/** /**
* This is the Person to Person implementation of <code>ChatRoom</code> * This is the Person to Person implementation of <code>ChatRoom</code>
* This room only allows for 1 to 1 conversations. * This room only allows for 1 to 1 conversations.
@ -409,7 +409,8 @@ public class ChatRoomImpl extends ChatRoom {
boolean broadcast = message.getProperty("broadcast") != null; boolean broadcast = message.getProperty("broadcast") != null;
// If this is a group chat message, discard // If this is a group chat message, discard
if (message.getType() == Message.Type.groupchat || broadcast) { if (message.getType() == Message.Type.groupchat || broadcast || message.getType() == Message.Type.normal ||
message.getType() == Message.Type.headline) {
return; return;
} }