From 9f5ad3739e58f8296a8e6ad6667ba865304d5d33 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Thu, 28 Jun 2012 13:26:35 +0200
Subject: [PATCH] Revert "add notifyReceived + refreshRegisters to java api"

This reverts commit cf9332d400cf4ac1b50e679bdd27ab851b5ceea7.
---
 java/common/org/linphone/core/LinphoneCore.java         | 8 --------
 java/common/org/linphone/core/LinphoneCoreListener.java | 9 ---------
 mediastreamer2                                          | 2 +-
 oRTP                                                    | 2 +-
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 6f0ce2c6..f4bcc7ef 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -180,9 +180,6 @@ public interface LinphoneCore {
 			this.tcp = t.tcp;
 			this.tls = t.tls;
 		}
-		public String toString() {
-			return "udp["+udp+"] tcp["+tcp+"] tls["+tls+"]";
-		}
 	}
 	/**
 	 * Media (RTP) encryption enum-like.
@@ -779,9 +776,4 @@ public interface LinphoneCore {
 	 * Set missed calls count to zero
 	 */
 	public void resetMissedCallsCount();
-	/**
-	 * re-initiates registration if network is up.
-	 */
-	public void refreshRegisters();
-
 }
diff --git a/java/common/org/linphone/core/LinphoneCoreListener.java b/java/common/org/linphone/core/LinphoneCoreListener.java
index 400e942c..cfe43895 100644
--- a/java/common/org/linphone/core/LinphoneCoreListener.java
+++ b/java/common/org/linphone/core/LinphoneCoreListener.java
@@ -103,14 +103,5 @@ public interface LinphoneCoreListener {
 	 * @param data
 	 */
 	void ecCalibrationStatus(LinphoneCore lc,LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data);
-	/**
-	 *  Report Notified message received for this identity.
-	 *  @param lc LinphoneCore
-	 *  @param call LinphoneCall in case the notify is part of a dialog, may be null
-	 *  @param from LinphoneAddress the message comes from
-	 *  @param event String the raw body of the notify event.
-	 *  
-	 */
-	void notifyReceived(LinphoneCore lc, LinphoneCall call, LinphoneAddress from, byte[] event);
 }
 
diff --git a/mediastreamer2 b/mediastreamer2
index 75eb1fcf..84b9ef05 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 75eb1fcf8d6097e51bcb507be339dd397c6b4dd5
+Subproject commit 84b9ef050c6abd26446901c2532573f2589a435b
diff --git a/oRTP b/oRTP
index 41d13b7e..2590e21d 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 41d13b7e491c7fc418987b63ff6ef80c7e8895a4
+Subproject commit 2590e21d864b43d6ac3a2ece0cf3b4d0e208e866
-- 
2.39.2