From 5ae087192226f2dda79d71df341695fdaa244ba2 Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Thu, 27 Apr 2006 11:56:11 +0000
Subject: [PATCH] Disable unused buttons in write button menu.

---
 .../main/contactlist/ContactListPanel.java    |  4 +--
 .../contactlist/ContactRightButtonMenu.java   | 26 +++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java
index 7cac1eeca..18c45232e 100755
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListPanel.java
@@ -222,11 +222,11 @@ public void mouseReleased(MouseEvent e) {
      * 
      * @author Yana Stamcheva
      */
-	private class RunMessageWindow implements Runnable {
+	public class RunMessageWindow implements Runnable {
 
 		private MetaContact contactItem;
 
-		private RunMessageWindow(MetaContact contactItem) {
+		public RunMessageWindow(MetaContact contactItem) {
 			this.contactItem = contactItem;
 		}
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
index 16c70e8b7..0203d526d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactRightButtonMenu.java
@@ -15,8 +15,10 @@
 import javax.swing.ImageIcon;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
 
 import net.java.sip.communicator.impl.gui.main.MainFrame;
+import net.java.sip.communicator.impl.gui.main.contactlist.ContactListPanel.RunMessageWindow;
 import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedMenu;
 import net.java.sip.communicator.impl.gui.main.customcontrols.AntialiasedMenuItem;
 import net.java.sip.communicator.impl.gui.main.customcontrols.MessageDialog;
@@ -66,7 +68,8 @@ public class ContactRightButtonMenu extends JPopupMenu implements
 
 	private MainFrame mainFrame;
 
-	public ContactRightButtonMenu(MainFrame mainFrame, MetaContact contactItem) {
+	public ContactRightButtonMenu(MainFrame mainFrame, 
+                                                        MetaContact contactItem) {
 		super();
 
 		this.mainFrame = mainFrame;
@@ -130,6 +133,15 @@ private void init() {
 		this.renameContactItem.addActionListener(this);
 		this.viewHistoryItem.addActionListener(this);
 		this.userInfoItem.addActionListener(this);
+        
+        //Disable all menu items that do nothing.
+        this.sendFileItem.setEnabled(false);
+        this.moveToMenu.setEnabled(false);
+        this.addSubcontactMenu.setEnabled(false);
+        this.removeContactItem.setEnabled(false);
+        this.renameContactItem.setEnabled(false);
+        this.viewHistoryItem.setEnabled(false);
+        this.userInfoItem.setEnabled(false);
 	}
 
 	public Point getPopupLocation() {
@@ -159,15 +171,13 @@ public void actionPerformed(ActionEvent e) {
 		String itemName = menuItem.getName();
 
 		if (itemName.equalsIgnoreCase("sendMessage")) {
-
-			ChatWindow msgWindow = new ChatWindow(this.mainFrame);
-
-			msgWindow.getCurrentChatPanel().addContactToChat(this.contactItem);
-
-			msgWindow.setVisible(true);
+            ContactListPanel clistPanel = mainFrame.getTabbedPane()
+                        .getContactListPanel();
+            SwingUtilities.invokeLater(
+                    clistPanel.new RunMessageWindow(
+                    contactItem));
 		} 
 		else if (itemName.equalsIgnoreCase("sendFile")) {
-
 			// disabled
 		} 
 		else if (itemName.equalsIgnoreCase("removeContact")) {