From 9efa93aa55fcc724f394e2f11befa6c0c48f5265 Mon Sep 17 00:00:00 2001
From: Derek DeMoro <derek@jivesoftware.com>
Date: Mon, 12 Mar 2007 14:05:21 +0000
Subject: [PATCH] Fixed pending icon issue missing.

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@7467 b35dd754-fafc-0310-a699-88a17e54d16e
---
 .../jivesoftware/spark/ui/ContactItem.java    | 45 ++++---------------
 1 file changed, 8 insertions(+), 37 deletions(-)

diff --git a/src/java/org/jivesoftware/spark/ui/ContactItem.java b/src/java/org/jivesoftware/spark/ui/ContactItem.java
index 8eac20d1..129a8169 100644
--- a/src/java/org/jivesoftware/spark/ui/ContactItem.java
+++ b/src/java/org/jivesoftware/spark/ui/ContactItem.java
@@ -26,13 +26,6 @@ import org.jivesoftware.spark.util.ModelUtil;
 import org.jivesoftware.spark.util.log.Log;
 import org.jivesoftware.sparkimpl.profile.VCardManager;
 
-import javax.imageio.ImageIO;
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.GridBagConstraints;
@@ -43,6 +36,13 @@ import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 
+import javax.imageio.ImageIO;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+
 /**
  * Represent a single contact within the <code>ContactList</code>.
  */
@@ -378,36 +378,7 @@ public class ContactItem extends JPanel {
 
             RosterEntry entry = SparkManager.getConnection().getRoster().getEntry(getJID());
             if (entry != null && (entry.getType() == RosterPacket.ItemType.none || entry.getType() == RosterPacket.ItemType.from)
-                    && RosterPacket.ItemStatus.SUBSCRIPTION_PENDING == entry.getStatus()) {
-                // Do not move out of group.
-                getNicknameLabel().setFont(new Font("Dialog", Font.PLAIN, 11));
-                setStatusText("Pending");
-            }
-            else {
-                setIcon(null);
-                setFont(new Font("Dialog", Font.PLAIN, 11));
-                getNicknameLabel().setFont(new Font("Dialog", Font.PLAIN, 11));
-                setAvailable(false);
-
-                String itemStatus = presence.getStatus();
-                if (itemStatus == null) {
-                    setStatusText("");
-                }
-                else {
-                    setStatusText(itemStatus);
-                }
-            }
-
-            setAvailable(false);
-            return;
-        }
-        else if (!presence.isAvailable()) {
-            getNicknameLabel().setFont(new Font("Dialog", Font.PLAIN, 11));
-            getNicknameLabel().setForeground((Color)UIManager.get("ContactItemOffline.color"));
-
-            RosterEntry entry = SparkManager.getConnection().getRoster().getEntry(getJID());
-            if (entry != null && (entry.getType() == RosterPacket.ItemType.none || entry.getType() == RosterPacket.ItemType.from)
-                    && RosterPacket.ItemStatus.SUBSCRIPTION_PENDING == entry.getStatus()) {
+                && RosterPacket.ItemStatus.SUBSCRIPTION_PENDING == entry.getStatus()) {
                 // Do not move out of group.
                 setIcon(SparkRes.getImageIcon(SparkRes.SMALL_QUESTION));
                 getNicknameLabel().setFont(new Font("Dialog", Font.PLAIN, 11));