Intermediate commit to save clean up (not currently working right now)

.classpath

@@ -6,6 +6,7 @@
 	<classpathentry kind="lib" path="lib/felix.jar">
 		<attributes>
 			<attribute name="javadoc_location" value="http://www.osgi.org/javadoc/r4v42/"/>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="jitsi/lib/native/linux-64"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="lib/bundle/junit.jar"/>

build.xml

@@ -1054,6 +1054,7 @@
         bundle-icq-slick,bundle-mock,bundle-smacklib,bundle-jmdnslib,
         bundle-jabber,bundle-jabber-slick,bundle-swing-ui,bundle-ui-service,
         bundle-jnalib,bundle-phonenumbers,
+        bundle-irc, bundle-plugin-ircaccregwizz,
         bundle-msn,bundle-msn-slick,bundle-yahoo,bundle-yahoo-slick,
         bundle-contactlist,meta-contactlist,meta-contactlist-slick,
         bundle-plugin-icqaccregwizz,bundle-plugin-jabberaccregwizz,
@@ -2091,7 +2092,6 @@ javax.swing.event, javax.swing.border"/>
          manifest="${src}/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf">
             <zipfileset dir="${dest}/net/java/sip/communicator/impl/protocol/irc"
                         prefix="net/java/sip/communicator/impl/protocol/irc"/>
-            <zipfileset src="${lib.noinst}/pircbot.jar" prefix=""/>
         </jar>
     </target>
 

lib/felix.client.run.properties

@@ -122,6 +122,7 @@ felix.auto.start.52= \
  reference:file:sc-bundles/protocol-jabber.jar \
  reference:file:sc-bundles/protocol-msn.jar \
  reference:file:sc-bundles/protocol-yahoo.jar \
+ reference:file:sc-bundles/protocol-irc.jar \
  reference:file:sc-bundles/reconnectplugin.jar
 
 felix.auto.start.55= \
@@ -162,6 +163,7 @@ felix.auto.start.67= \
  reference:file:sc-bundles/googletalkaccregwizz.jar \
  reference:file:sc-bundles/msnaccregwizz.jar \
  reference:file:sc-bundles/yahooaccregwizz.jar \
+ reference:file:sc-bundles/ircaccregwizz.jar \
  reference:file:sc-bundles/contacteventhandler.jar \
  reference:file:sc-bundles/notificationconfig.jar \
  reference:file:sc-bundles/notification-handlers.jar \

src/net/java/sip/communicator/impl/protocol/irc/ChatRoomIrcImpl.java

@@ -293,8 +293,8 @@ public Iterator<ChatRoomMember> getBanList()
     public void banParticipant(ChatRoomMember chatRoomMember, String reason)
         throws OperationFailedException
     {
-        this.parentProvider.getIrcStack().banParticipant(this.getName(),
+        this.parentProvider.getIrcStack().banParticipant(this,
-            chatRoomMember.getContactAddress(), reason);
+            chatRoomMember, reason);
     }
 
     /**
@@ -308,8 +308,8 @@ public void banParticipant(ChatRoomMember chatRoomMember, String reason)
     public void kickParticipant(ChatRoomMember chatRoomMember, String reason)
         throws OperationFailedException
     {
-        this.parentProvider.getIrcStack().kickParticipant(this.getName(),
+        this.parentProvider.getIrcStack().kickParticipant(this,
-            chatRoomMember.getContactAddress(), reason);
+            chatRoomMember, reason);
     }
 
     /**
@@ -490,7 +490,7 @@ public String getSubject()
     public void setSubject(String subject)
         throws OperationFailedException
     {
-        parentProvider.getIrcStack().setSubject(getName(), subject);
+        parentProvider.getIrcStack().setSubject(this, subject);
     }
 
     /**
@@ -645,7 +645,7 @@ protected void clearChatRoomMemberList()
     public void invite(String userAddress, String reason)
     {
         parentProvider.getIrcStack()
-            .sendInvite(userAddress, chatRoomName);
+            .invite(userAddress, this);
     }
 
     /**
@@ -740,12 +740,12 @@ public void sendMessage(Message message) throws OperationFailedException
             if (((MessageIrcImpl) message).isCommand())
             {
                 parentProvider.getIrcStack()
-                    .sendCommand(this, messagePortion);
+                    .command(this, messagePortion);
             }
             else
             {
                 parentProvider.getIrcStack()
-                    .sendMessage(chatRoomName, messagePortion);
+                    .message(this, messagePortion);
             }
 
             this.fireMessageDeliveredEvent(

src/net/java/sip/communicator/impl/protocol/irc/ProtocolProviderServiceIrcImpl.java

@@ -100,7 +100,7 @@ protected void initialize(String userID, AccountID accountID)
                         this,
                         userID,
                         userID,
-                        "SIP Communicator 1.0",
+                        "Jitsi",
                         "");
 
             isInitialized = true;