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

Adding escaped JID support.

Browse Source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/spark/trunk@5261 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Derek DeMoro
2006-09-06 06:46:48 +00:00
committed by derek
parent 558e9531ec
commit bd40fadc1a
10 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/lib/ant-contrib.jar Normal file
View File

Binary file not shown.

BIN
build/lib/dist/smack.jar vendored
View File

Binary file not shown.

BIN
build/lib/dist/smackx-debug.jar vendored
View File

Binary file not shown.

BIN
build/lib/dist/smackx.jar vendored
View File

Binary file not shown.

BIN
src/commercial/fastpath.jar
View File

Binary file not shown.

3
src/java/org/jivesoftware/spark/UserManager.java
View File

@ -12,6 +12,7 @@ package org.jivesoftware.spark;
import org.jivesoftware.resource.SparkRes;
import org.jivesoftware.smack.Roster;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smackx.muc.Occupant;
import org.jivesoftware.smackx.packet.VCard;
@ -255,7 +256,7 @@ public class UserManager {
return item.getNickname();
}
return jid;
return StringUtils.unescapeJID(jid);
}
/**

9
src/java/org/jivesoftware/spark/ui/ContactList.java
View File

@ -1711,9 +1711,12 @@ public final class ContactList extends JPanel implements ActionListener, Contact
messageLabel.setText(message);
layoutPanel.add(messageLabel, new GridBagConstraints(0, 0, 5, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 5, 5, 5), 0, 0));
RolloverButton acceptButton = new RolloverButton(Res.getString("button.accept"));
RolloverButton viewInfoButton = new RolloverButton(Res.getString("button.profile"));
RolloverButton denyButton = new RolloverButton(Res.getString("button.deny"));
RolloverButton acceptButton = new RolloverButton();
ResourceUtils.resButton(acceptButton, Res.getString("button.accept"));
RolloverButton viewInfoButton = new RolloverButton();
ResourceUtils.resButton(viewInfoButton, Res.getString("button.profile"));
RolloverButton denyButton = new RolloverButton();
ResourceUtils.resButton(denyButton, Res.getString("button.deny"));
layoutPanel.add(acceptButton, new GridBagConstraints(2, 1, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
layoutPanel.add(viewInfoButton, new GridBagConstraints(3, 1, 1, 1, 0.0, 0.0, GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));
layoutPanel.add(denyButton, new GridBagConstraints(4, 1, 1, 1, 0.0, 1.0, GridBagConstraints.NORTHEAST, GridBagConstraints.NONE, new Insets(5, 5, 5, 5), 0, 0));

3
src/java/org/jivesoftware/spark/ui/VCardPanel.java
View File

@ -12,6 +12,7 @@ package org.jivesoftware.spark.ui;
import org.jivesoftware.resource.Res;
import org.jivesoftware.smack.PacketCollector;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smack.filter.PacketIDFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smackx.packet.Time;
@ -167,7 +168,7 @@ public class VCardPanel extends JPanel {
usernameLabel.setText(firstName + " " + lastName);
}
else {
usernameLabel.setText(jid);
usernameLabel.setText(StringUtils.unescapeJID(jid));
}

3
src/java/org/jivesoftware/sparkimpl/plugin/jabber/VersionViewer.java
View File

@ -13,6 +13,7 @@ package org.jivesoftware.sparkimpl.plugin.jabber;
import org.jivesoftware.resource.Res;
import org.jivesoftware.resource.SparkRes;
import org.jivesoftware.smack.PacketCollector;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smack.filter.PacketIDFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smackx.packet.Time;
@ -130,7 +131,7 @@ public class VersionViewer {
versionField.setEditable(false);
softwareField.setEditable(false);
timeField.setEditable(false);
MessageDialog.showComponent(Res.getString("title.version.and.time"), Res.getString("message.client.information", jid), SparkRes.getImageIcon(SparkRes.PROFILE_IMAGE_24x24), panel, SparkManager.getMainWindow(), 400, 300, false);
MessageDialog.showComponent(Res.getString("title.version.and.time"), Res.getString("message.client.information", StringUtils.unescapeJID(jid)), SparkRes.getImageIcon(SparkRes.PROFILE_IMAGE_24x24), panel, SparkManager.getMainWindow(), 400, 300, false);
}
}

3
src/resources/i18n/spark_i18n_en.properties
View File

@ -33,7 +33,7 @@ button.browse3 = Br&owse...
button.approve = &Approve
button.deny = &Deny
button.accept = &Accept
button.profile = *Profile
button.profile = &Profile
button.add.a.contact = &Add A Contact
button.reconnect = &Reconnect
button.add = &Add
@ -334,6 +334,7 @@ message.transfer.rate = Transfer Rate
message.total.downloaded = Total Downloaded
message.new.spark.available = {0} is now available. Would you like to install?
message.restart.spark.to.install = You need to shut down the client to install latest version. Would you like to do that now?
message.add.to.roster = Add To Roster
title.passwords.no.match = Confirm passwords.
title.create.problem = Account Creation Problem