From 5558392dedc4b5e089f9786efaa480bc1c2d635c Mon Sep 17 00:00:00 2001
From: Boris Grozev <boris@jitsi.org>
Date: Tue, 18 Jun 2013 11:33:50 +0300
Subject: [PATCH] Part of last commit

---
 ...erationSetTelephonyConferencingJabberImpl.java |  2 +-
 .../OperationSetTelephonyConferencingSipImpl.java | 15 +--------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
index 2d6b7af81..d288ec629 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java
@@ -369,7 +369,7 @@ public void processPacket(Packet packet)
      */
     private void handleCoin(CallPeerJabberImpl callPeer, CoinIQ coinIQ)
     {
-        setConferenceInfoXML(callPeer, -1, coinIQ.getChildElementXML());
+        setConferenceInfoXML(callPeer, coinIQ.getChildElementXML());
     }
 
     /**
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTelephonyConferencingSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTelephonyConferencingSipImpl.java
index ec8147e80..11ea071db 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTelephonyConferencingSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/OperationSetTelephonyConferencingSipImpl.java
@@ -604,13 +604,6 @@ public void responseProcessed(
     private class ConferenceNotifierSubscription
         extends EventPackageNotifier.Subscription
     {
-
-        /**
-         * The value of the <tt>version</tt> attribute to be specified in the
-         * outgoing <tt>conference-info</tt> root XML elements.
-         */
-        private int version = 1;
-
         /**
          * Initializes a new <tt>ConferenceNotifierSubscription</tt> instance
          * with a specific subscription <tt>Address</tt>/Request URI and a
@@ -683,7 +676,6 @@ protected byte[] createNotifyContent(
                             uee);
                     notifyContent = conferenceInfoXML.getBytes();
                 }
-                ++ version;
             }
             return notifyContent;
         }
@@ -816,14 +808,9 @@ protected void processActiveRequest(
         {
             if (rawContent != null)
             {
-                int contentVersion
-                    = setConferenceInfoXML(
+                setConferenceInfoXML(
                         callPeer,
-                        version,
                         SdpUtils.getContentAsString(requestEvent.getRequest()));
-
-                if (contentVersion >= version)
-                    version = contentVersion;
             }
         }