mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2026-08-18 11:10:02 +00:00
Code Issues Projects Releases Wiki Activity

1) Remove time chat was started.

Browse Source 
2) Fixed SPARK-336 Broadcast error.
3) Fixed Applet Plugin
4) Fixed Growl Plugin

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@4925 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2006-08-15 18:06:03 +00:00
committed by derek
parent 731e3370b8
commit e51fe7fc83
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,7 @@ public class ChatRoomImpl extends ChatRoom {
// The name of the room will be the node of the user jid + conversation.
final SimpleDateFormat formatter = new SimpleDateFormat("h:mm a");
this.roomTitle = participantNickname + " - Started " + formatter.format(new Date());
this.roomTitle = participantNickname;
// Add RoomInfo
this.getSplitPane().setRightComponent(null);

8
src/java/org/jivesoftware/sparkimpl/plugin/alerts/BroadcastPlugin.java
View File

@ -17,6 +17,7 @@ import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.packet.DelayInformation;
import org.jivesoftware.smackx.packet.VCard;
import org.jivesoftware.spark.SparkManager;
import org.jivesoftware.spark.component.InputDialog;
@ -162,6 +163,13 @@ public class BroadcastPlugin implements Plugin, PacketListener {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
final Message message = (Message)packet;
// Do not handle errors or offline messages
final DelayInformation offlineInformation = (DelayInformation)message.getExtension("x", "jabber:x:delay");
if (offlineInformation != null || message.getError() != null) {
return;
}
boolean broadcast = message.getProperty("broadcast") != null;
if ((broadcast || (message.getType() == Message.Type.NORMAL) || message.getType() == Message.Type.HEADLINE) && message.getBody() != null) {

2
src/plugins/apple/src/plugin.xml
View File

@ -6,7 +6,7 @@
<homePage>http://www.jivesoftware.com</homePage>
<email>andrew@jivesoftware.com</email>
<description>Gives Spark mac notification capabilities and other enhancements.</description>
<class>org.jivesoftware.spark.plugin.apple.ApplePlugin</class>
<class>com.jivesoftware.spark.plugin.apple.ApplePlugin</class>
<minSparkVersion>2.0.0.1</minSparkVersion>
</plugin>

2
src/plugins/growl/src/plugin.xml
View File

@ -5,6 +5,6 @@
<homePage>http://www.jivesoftware.com</homePage>
<email>andrew@jivesoftware.com</email>
<description>Provides Growl notifications on Mac OS X.(http://growl.info)</description>
<class>org.jivesoftware.spark.plugin.growl.GrowlPlugin</class>
<class>com.jivesoftware.spark.plugin.growl.GrowlPlugin</class>
<minSparkVersion>2.0.0.1</minSparkVersion>
</plugin>