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

Remove placeholder for conversation history in Jingle.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@7417 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2007-03-09 00:59:57 +00:00
committed by derek
parent 53a7a42f83
commit 73173f7dd8
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/jingle/src/java/org/jivesoftware/sparkplugin/JingleRoom.java
View File

@ -19,7 +19,6 @@ import org.jivesoftware.spark.ui.ChatRoom;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JSeparator;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
@ -88,12 +87,12 @@ public class JingleRoom extends JPanel {
// Build Control Panel // Build Control Panel
final JPanel controlPanel = buildControlPanel(); final JPanel controlPanel = buildControlPanel();
add(controlPanel, new GridBagConstraints(1, 6, 1, 1, 0.0, 0.0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(2, 2, 2, 2), 0, 0)); add(controlPanel, new GridBagConstraints(1, 6, 1, 1, 1.0, 1.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(2, 2, 2, 2), 0, 0));
// Add Previous Conversation // Add Previous Conversation
historyPanel = new PreviousConversationPanel(); historyPanel = new PreviousConversationPanel();
historyPanel.addPreviousConversations(""); historyPanel.addPreviousConversations("");
add(historyPanel, new GridBagConstraints(1, 8, 1, 1, 0.0, 1.0, GridBagConstraints.SOUTH, GridBagConstraints.BOTH, new Insets(2, 2, 2, 2), 0, 100)); // add(historyPanel, new GridBagConstraints(1, 8, 1, 1, 0.0, 1.0, GridBagConstraints.SOUTH, GridBagConstraints.BOTH, new Insets(2, 2, 2, 2), 0, 100));
// Setup default settings // Setup default settings
setupDefaults(); setupDefaults();
@ -181,7 +180,6 @@ public class JingleRoom extends JPanel {
}); });
hangUpButton.addActionListener(new ActionListener() { hangUpButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent actionEvent) { public void actionPerformed(ActionEvent actionEvent) {
hangUpButton.setEnabled(false); hangUpButton.setEnabled(false);