aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Vincent <seb@jitsi.org>2010-12-01 15:14:29 +0000
committerSebastien Vincent <seb@jitsi.org>2010-12-01 15:14:29 +0000
commit1cd7e976164a1c3db82b74a9b9a98a5fcef4019a (patch)
tree301faa218dba369f3d871792725a2cec2f579f3d
parentee23336e707dd7264b256b231af290c07eae532c (diff)
downloadjitsi-1cd7e976164a1c3db82b74a9b9a98a5fcef4019a.zip
jitsi-1cd7e976164a1c3db82b74a9b9a98a5fcef4019a.tar.gz
jitsi-1cd7e976164a1c3db82b74a9b9a98a5fcef4019a.tar.bz2
Fix callee name in error message.
-rw-r--r--src/net/java/sip/communicator/impl/contactlist/MetaContactImpl.java10
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java4
2 files changed, 10 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/impl/contactlist/MetaContactImpl.java b/src/net/java/sip/communicator/impl/contactlist/MetaContactImpl.java
index 11fe696..9ed05dd 100644
--- a/src/net/java/sip/communicator/impl/contactlist/MetaContactImpl.java
+++ b/src/net/java/sip/communicator/impl/contactlist/MetaContactImpl.java
@@ -1328,6 +1328,12 @@ public class MetaContactImpl
addCapabilities(contact, opSets);
}
+ /**
+ * Remove capabilities for the given contacts.
+ *
+ * @param contact the <tt>Contact</tt>, which capabilities we remove
+ * @param opSets the new updated set of operation sets
+ */
private void removeCapabilities(Contact contact,
Map<String, ? extends OperationSet> opSets)
{
@@ -1352,8 +1358,8 @@ public class MetaContactImpl
}
/**
- * Adds the capabilities of the given contact.
- *
+ * Adds the capabilities of the given contact.
+ *
* @param contact the <tt>Contact</tt>, which capabilities we add
* @param opSets the map of operation sets supported by the contact
*/
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
index 6d45f71..ac6bfa2 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
@@ -266,7 +266,7 @@ public class OperationSetBasicTelephonyJabberImpl
if(di != null)
{
if (logger.isInfoEnabled())
- logger.info(fullCalleeURI + ": jingle supported ");
+ logger.info(calleeAddress + ": jingle supported ");
}
else
{
@@ -274,7 +274,7 @@ public class OperationSetBasicTelephonyJabberImpl
logger.info(calleeAddress + ": jingle not supported ?");
throw new OperationFailedException(
"Failed to create OutgoingJingleSession.\n"
- + fullCalleeURI + " does not support jingle",
+ + calleeAddress + " does not support jingle",
OperationFailedException.INTERNAL_ERROR);
}