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

Thanks to Guus der Kinderen for this patch:

Browse Source 
[SPARK-1025] Make rename global and not limited to just the contact list

git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@10687 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Andrew Seymour
2008-07-17 18:40:44 +00:00
committed by andrew.seymour
parent bd984dc5a0
commit ae0eacf8ff
20 changed files with 972 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/org/jivesoftware/spark/filetransfer/SparkTransferManager.java
View File

@ -254,7 +254,7 @@ public class SparkTransferManager {
ChatRoom chatRoom;
if (contactItem != null) {
chatRoom = SparkManager.getChatManager().createChatRoom(bareJID, contactItem.getNickname(), contactItem.getNickname());
chatRoom = SparkManager.getChatManager().createChatRoom(bareJID, contactItem.getDisplayName(), contactItem.getDisplayName());
}
else {
chatRoom = SparkManager.getChatManager().createChatRoom(bareJID, bareJID, bareJID);
@ -291,7 +291,7 @@ public class SparkTransferManager {
chatRoom.scrollToBottom();
String fileTransMsg = contactItem.getNickname() + " " + Res.getString("message.file.transfer.short.message") + " " + fileName;
String fileTransMsg = contactItem.getDisplayName() + " " + Res.getString("message.file.transfer.short.message") + " " + fileName;
SparkManager.getChatManager().getChatContainer().fireNotifyOnMessage(chatRoom, true, fileTransMsg, Res.getString("message.file.transfer.notification"));
}
@ -512,7 +512,7 @@ public class SparkTransferManager {
ChatRoom chatRoom;
ContactItem contactItem = contactList.getContactItemByJID(jid);
if (contactItem != null) {
chatRoom = SparkManager.getChatManager().createChatRoom(jid, contactItem.getNickname(), contactItem.getNickname());
chatRoom = SparkManager.getChatManager().createChatRoom(jid, contactItem.getDisplayName(), contactItem.getDisplayName());
}
else {
chatRoom = SparkManager.getChatManager().createChatRoom(jid, jid, jid);
@ -530,7 +530,7 @@ public class SparkTransferManager {
ChatRoom chatRoom;
if (contactItem != null) {
chatRoom = SparkManager.getChatManager().createChatRoom(bareJID, contactItem.getNickname(), contactItem.getNickname());
chatRoom = SparkManager.getChatManager().createChatRoom(bareJID, contactItem.getDisplayName(), contactItem.getDisplayName());
}
else {
chatRoom = SparkManager.getChatManager().createChatRoom(bareJID, bareJID, bareJID);
@ -578,7 +578,7 @@ public class SparkTransferManager {
});
try {
sendingUI.sendFile(transfer, transferManager, fullJID, contactItem.getNickname());
sendingUI.sendFile(transfer, transferManager, fullJID, contactItem.getDisplayName());
}
catch (NullPointerException e) {
Log.error(e);