From addb84ada6b96a3f3756b0ffdbad57f009036bd6 Mon Sep 17 00:00:00 2001
From: Derek DeMoro <derek@jivesoftware.com>
Date: Fri, 23 Mar 2007 18:10:52 +0000
Subject: [PATCH] SPARK-621 Clicking on a user's avatar, then view full profile
 brings up "edit profile information"

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@7683 b35dd754-fafc-0310-a699-88a17e54d16e
---
 src/java/org/jivesoftware/spark/ChatManager.java               | 1 -
 src/java/org/jivesoftware/sparkimpl/profile/PersonalPanel.java | 1 +
 src/java/org/jivesoftware/sparkimpl/profile/VCardEditor.java   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java/org/jivesoftware/spark/ChatManager.java b/src/java/org/jivesoftware/spark/ChatManager.java
index b735bafb..bf7b8dd9 100644
--- a/src/java/org/jivesoftware/spark/ChatManager.java
+++ b/src/java/org/jivesoftware/spark/ChatManager.java
@@ -400,7 +400,6 @@ public class ChatManager implements MessageEventNotificationListener {
         final ChatManager chatManager = SparkManager.getChatManager();
         Iterator filters = chatManager.getMessageFilters().iterator();
         try {
-            getChatContainer().getChatRoom(StringUtils.parseBareAddress(message.getFrom()));
             cancelledNotification(message.getFrom(), "");
         }
         catch (Exception e) {
diff --git a/src/java/org/jivesoftware/sparkimpl/profile/PersonalPanel.java b/src/java/org/jivesoftware/sparkimpl/profile/PersonalPanel.java
index e3459422..c0e170e4 100644
--- a/src/java/org/jivesoftware/sparkimpl/profile/PersonalPanel.java
+++ b/src/java/org/jivesoftware/sparkimpl/profile/PersonalPanel.java
@@ -144,6 +144,7 @@ public class PersonalPanel extends JPanel {
             Component comp = comps[i];
             if (comp instanceof JTextField) {
                 ((JTextField)comp).setEditable(allowEditing);
+                comp.setEnabled(allowEditing);
             }
         }
     }
diff --git a/src/java/org/jivesoftware/sparkimpl/profile/VCardEditor.java b/src/java/org/jivesoftware/sparkimpl/profile/VCardEditor.java
index 331af9dc..94b232c4 100644
--- a/src/java/org/jivesoftware/sparkimpl/profile/VCardEditor.java
+++ b/src/java/org/jivesoftware/sparkimpl/profile/VCardEditor.java
@@ -182,7 +182,7 @@ public class VCardEditor {
         }
 
         // Create the title panel for this dialog
-        titlePanel = new TitlePanel(Res.getString("title.edit.profile"), Res.getString("message.save.profile"), icon, true);
+        titlePanel = new TitlePanel(Res.getString("title.profile.information"), "", icon, true);
 
         // Construct main panel w/ layout.
         final JPanel mainPanel = new JPanel();