--- kdenetwork-4.10.5/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc	2013-06-28 21:08:21.977067748 +0300
+++ kdenetwork-4.10.5/kopete/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc	2013-07-07 17:41:21.629547119 +0300
@@ -143,7 +143,7 @@ void LinphoneMediaChannel::SetCodecs(con
       LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
       pt_ = i->id;
       audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
-      port2 = rtp_session_get_local_port(audio_stream_->session);
+      port2 = rtp_session_get_local_port(audio_stream_->ms.session);
       first = false;
     }
   }
@@ -154,7 +154,7 @@ void LinphoneMediaChannel::SetCodecs(con
     // working with a buggy client; let's try PCMU.
     LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
     audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
-    port2 = rtp_session_get_local_port(audio_stream_->session);
+    port2 = rtp_session_get_local_port(audio_stream_->ms.session);
   }
  
 }
--- kdenetwork-4.10.5/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h	2013-06-28 21:08:21.972067548 +0300
+++ kdenetwork-4.10.5/kopete/protocols/jabber/googletalk/libjingle/talk/p2p/base/stun.h	2013-07-08 00:21:15.690170614 +0300
@@ -25,18 +25,8 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __STUN_H__
-#define __STUN_H__
-
-// This file contains classes for dealing with the STUN and TURN protocols.
-// Both protocols use the same wire format.
-
-#include "talk/base/basictypes.h"
-#include "talk/base/bytebuffer.h"
-#include <string>
-#include <vector>
-
-namespace cricket {
+#ifndef STUN__HH__IN__STUNREQUEST__HH__CYCLIC_PROBLEM_FIX
+#define STUN__HH__IN__STUNREQUEST__HH__CYCLIC_PROBLEM_FIX
 
 // These are the types of STUN & TURN messages as of last check.
 enum StunMessageType {
@@ -55,6 +45,21 @@ enum StunMessageType {
   STUN_DATA_INDICATION              = 0x0115
 };
 
+#endif // STUN__HH__IN__STUNREQUEST__HH__CYCLIC_PROBLEM_FIX
+
+#ifndef __STUN_H__
+#define __STUN_H__
+
+// This file contains classes for dealing with the STUN and TURN protocols.
+// Both protocols use the same wire format.
+
+#include "talk/base/basictypes.h"
+#include "talk/base/bytebuffer.h"
+#include <string>
+#include <vector>
+
+namespace cricket {
+
 // These are the types of attributes defined in STUN & TURN.  Next to each is
 // the name of the class (T is StunTAttribute) that implements that type.
 enum StunAttributeType {