Changed icon for roster menu top level (to collaboration icon). Made additions to DocShare class that support changes by initiator while receiver is waiting.

3 files changed, 4 insertions, 1 deletions

diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/icons/collaboration.gif b/framework/bundles/org.eclipse.ecf.presence.ui/icons/collaboration.gif
new file mode 100644
index 000000000..6b343da8d
--- /dev/null
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/icons/collaboration.gif
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Activator.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Activator.java
index ad43a3503..3b16b8f21 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Activator.java
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/internal/presence/ui/Activator.java
@@ -29,6 +29,8 @@ public class Activator extends AbstractUIPlugin {
 
 	public static final String CONTACTS_IMAGE = "contacts"; //$NON-NLS-1$
 
+	public static final String COLLABORATION_IMAGE = "collaboration"; //$NON-NLS-1$
+
 	// The shared instance
 	private static Activator plugin;
 
@@ -74,6 +76,7 @@ public class Activator extends AbstractUIPlugin {
 	protected ImageRegistry createImageRegistry() {
 		ImageRegistry registry = super.createImageRegistry();
 		registry.put(CONTACTS_IMAGE, AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, "icons/contacts.gif").createImage()); //$NON-NLS-1$
+		registry.put(COLLABORATION_IMAGE, AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, "icons/collaboration.gif").createImage()); //$NON-NLS-1$
 		return registry;
 	}
 
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuContributionItem.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuContributionItem.java
index 5c26fe176..3473e455a 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuContributionItem.java
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/menu/AbstractRosterMenuContributionItem.java
@@ -52,7 +52,7 @@ public abstract class AbstractRosterMenuContributionItem extends CompoundContrib
 
 	private String topMenuName = DEFAULT_TOP_MENU_NAME;
 
-	private ImageDescriptor topMenuImageDescriptor = Activator.getDefault().getImageRegistry().getDescriptor(Activator.CONTACTS_IMAGE);
+	private ImageDescriptor topMenuImageDescriptor = Activator.getDefault().getImageRegistry().getDescriptor(Activator.COLLABORATION_IMAGE);
 
 	protected void setTopMenuName(String name) {
 		this.topMenuName = name;