Additions for Skype IChannelContainerAdapter support

2 files changed, 6 insertions, 3 deletions

diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties
index 86446c7be..525d5e52b 100644
--- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties
+++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/internal/presence/collab/ui/messages.properties
@@ -11,7 +11,7 @@ URLShare_ERROR_RECEIVE_MESSAGE=Error receiving message:
 URLShare_EXCEPTION_LOG_MESSAGE=Exception in URLShare.handleMessage
 URLShare_RECEIVED_URL_TITLE=Received URL
 URLShare_ERROR_SEND_TITLE=Error sending message
-URLShare_ERROR_SEND_MESSAGE=Error sending message: 
+URLShare_ERROR_SEND_MESSAGE=Error sending message: {0}
 URLShare_EXCEPTION_LOG_SEND=Exception in URLShare.sendURL
 URLShare_RECEIVED_URL_MESSAGE=Received URL from {0}\n\nDo you want to display?
 URLShare_ERROR_BROWSER_TITLE=Error opening browser
diff --git a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/URLShare.java b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/URLShare.java
index 2714448a2..ace0fed8b 100644
--- a/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/URLShare.java
+++ b/framework/bundles/org.eclipse.ecf.presence.collab.ui/src/org/eclipse/ecf/presence/collab/ui/URLShare.java
@@ -92,11 +92,14 @@ public class URLShare extends AbstractShare {
 						try {
 							sendMessage(toID, serialize(new Object[] {
 									senderuser, send }));
+						} catch (ECFException e) {
+							MessageDialog.openError(null, Messages.URLShare_ERROR_SEND_TITLE, NLS.bind(
+									Messages.URLShare_ERROR_SEND_MESSAGE, e.getStatus().getException().getLocalizedMessage()));
+							Activator.getDefault().getLog().log(e.getStatus());
 						} catch (Exception e) {
 							MessageDialog.openError(null, Messages.URLShare_ERROR_SEND_TITLE, NLS.bind(
 									Messages.URLShare_ERROR_SEND_MESSAGE, e.getLocalizedMessage()));
-							Activator.getDefault().getLog().log(
-									new Status(IStatus.ERROR, Activator.PLUGIN_ID,
+							Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
 											IStatus.ERROR, Messages.URLShare_EXCEPTION_LOG_SEND,
 											e));
 						}