Fixes for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=180364, and for https://bugs.eclipse.org/bugs/show_bug.cgi?id=177014

2 files changed, 31 insertions, 1 deletions

diff --git a/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/container/IRCAbstractContainer.java b/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/container/IRCAbstractContainer.java
index 341f0976b..e3f0990bb 100644
--- a/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/container/IRCAbstractContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/container/IRCAbstractContainer.java
@@ -68,7 +68,7 @@ public abstract class IRCAbstractContainer extends AbstractContainer {
 		for (Iterator i = msgListeners.iterator(); i.hasNext();) {
 			IIMMessageListener l = (IIMMessageListener) i.next();
 			l.handleMessageEvent(new ChatRoomMessageEvent(sender,
-					new ChatRoomMessage(sender, msg)));
+					new ChatRoomMessage(sender, targetID, msg)));
 		}
 	}
 
diff --git a/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/container/IRCRootContainer.java b/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/container/IRCRootContainer.java
index 62a5b04f2..0bad07853 100644
--- a/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/container/IRCRootContainer.java
+++ b/providers/bundles/org.eclipse.ecf.provider.irc/src/org/eclipse/ecf/internal/provider/irc/container/IRCRootContainer.java
@@ -40,6 +40,8 @@ import org.eclipse.ecf.presence.chatroom.IChatRoomInvitationListener;
 import org.eclipse.ecf.presence.chatroom.IChatRoomManager;
 import org.eclipse.ecf.presence.chatroom.IChatRoomMessageSender;
 import org.eclipse.ecf.presence.chatroom.IChatRoomParticipantListener;
+import org.eclipse.ecf.presence.history.IHistory;
+import org.eclipse.ecf.presence.history.IHistoryManager;
 import org.eclipse.osgi.util.NLS;
 import org.schwering.irc.lib.IRCConnection;
 import org.schwering.irc.lib.IRCEventListener;
@@ -913,4 +915,32 @@ public class IRCRootContainer extends IRCAbstractContainer implements
 				null);
 	}
 
+	protected IHistoryManager chatRoomHistoryManager = new IHistoryManager() {
+
+		public IHistory getHistory(ID chatRoomID, Map options) {
+			// TODO Auto-generated method stub
+			return null;
+		}
+
+		public boolean isActive() {
+			// TODO Auto-generated method stub
+			return false;
+		}
+
+		public void setActive(boolean active) {
+			// TODO Auto-generated method stub
+			
+		}
+
+		public Object getAdapter(Class adapter) {
+			// TODO Auto-generated method stub
+			return null;
+		}
+		
+	};
+	
+	public IHistoryManager getHistoryManager() {
+		return chatRoomHistoryManager;
+	}
+
 }