Show an error message if we try to initiate a call to an XMPP contact, who does

not support either Jingle or GTalk.

1 files changed, 10 insertions, 3 deletions

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 59a05a1..89f662d 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetBasicTelephonyJabberImpl.java
@@ -315,6 +315,13 @@ public class OperationSetBasicTelephonyJabberImpl
         if (fullCalleeURI == null)
             fullCalleeURI = discoverFullJid(calleeAddress, alwaysCallGtalk);
 
+        if (fullCalleeURI == null)
+            throw new OperationFailedException(
+                    "Failed to create outgoing call to " + calleeAddress
+                            + ". Could not find a resource which supports " +
+                            "Jingle or Google Talk",
+                    OperationFailedException.INTERNAL_ERROR);
+
         DiscoverInfo di = null;
 
         try
@@ -363,7 +370,7 @@ public class OperationSetBasicTelephonyJabberImpl
                     fullCalleeURI + ": jingle and Google Talk not supported?");
 
             throw new OperationFailedException(
-                    "Failed to create OutgoingJingleSession.\n"
+                    "Failed to create an outgoing call.\n"
                     + fullCalleeURI + " does not support jingle or Google Talk",
                     OperationFailedException.INTERNAL_ERROR);
         }
@@ -440,8 +447,8 @@ public class OperationSetBasicTelephonyJabberImpl
     }
 
     /**
-     * Discover on which resource the remote user is connected and what are
-     * its priorities and capabilities.
+     * Discovers the resource for <tt>calleeAddress</tt> with the highest
+     * priority which supports either Jingle or Gtalk. Returns the full JID.
      *
      * @param calleeAddress the address of the callee
      * @param isAlwaysCallGtalk indicates if gtalk should be called