Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 19 insertions, 2 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java
index 8a6f3ed..6c4c358 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/ChatRoomJabberImpl.java
@@ -609,7 +609,7 @@ public class ChatRoomJabberImpl
                 this.provider.getConnection().addPacketListener(
                     presenceListener,
                     new AndFilter(
-                        new FromMatchesFilter(multiUserChat.getRoom()),
+                        FromMatchesFilter.create(multiUserChat.getRoom()),
                         new PacketTypeFilter(
                             org.jivesoftware.smack.packet.Presence.class)));
                 if(password == null)
@@ -868,7 +868,7 @@ public class ChatRoomJabberImpl
 
         clearCachedConferenceDescriptionList();
 
-        XMPPConnection connection = this.provider.getConnection();
+        Connection connection = this.provider.getConnection();
         try
         {
             // if we are already disconnected
@@ -1896,6 +1896,23 @@ public class ChatRoomJabberImpl
     }
 
     /**
+     * Removes given <tt>PacketExtension</tt> from the MUC presence and
+     * publishes it immediately.
+     * @param extension the <tt>PacketExtension</tt> to be removed from the MUC
+     *                  presence.
+     */
+    public void removePresenceExtension(PacketExtension extension)
+    {
+        if (lastPresenceSent != null)
+        {
+            setPacketExtension(
+                lastPresenceSent, null, extension.getNamespace());
+
+            provider.getConnection().sendPacket(lastPresenceSent);
+        }
+    }
+
+    /**
      * Returns the ids of the users that has the member role in the room.
      * When the room is member only, this are the users allowed to join.
      * @return the ids of the users that has the member role in the room.