From 3051c9bdad1974f0c7e4a74620f363166a7ea557 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 23 Jul 2013 21:10:14 +0200
Subject: [PATCH] add LinphoneReasonDoNotDisturb

---
 coreapi/linphonecore.c                    |  5 +++++
 coreapi/linphonecore.h                    |  4 +++-
 coreapi/misc.c                            |  4 +++-
 java/common/org/linphone/core/Reason.java | 14 +++++++++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 888b07dda..5a76fbc58 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3357,6 +3357,9 @@ int linphone_core_decline_call(LinphoneCore *lc, LinphoneCall * call, LinphoneRe
 		case LinphoneReasonBusy:
 			sal_reason=SalReasonBusy;
 		break;
+		case LinphoneReasonDoNotDistrub:
+			sal_reason = SalReasonDoNotDisturb;
+		break;
 		default:
 			ms_error("linphone_core_decline_call(): unsupported reason %s",linphone_reason_to_string(reason));
 			return -1;
@@ -5782,6 +5785,8 @@ const char *linphone_reason_to_string(LinphoneReason err){
 			return "Incompatible media capabilities";
 		case LinphoneReasonIOError:
 			return "IO error";
+		case LinphoneReasonDoNotDistrub:
+			return "Do not distrub";
 	}
 	return "unknown error";
 }
diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index a48ec44b8..bca080aa3 100644
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -133,7 +133,9 @@ enum _LinphoneReason{
 	LinphoneReasonNotAnswered, /**<The call was not answered in time*/
 	LinphoneReasonBusy, /**<Phone line was busy */
 	LinphoneReasonMedia, /**<Incompatible media */
-	LinphoneReasonIOError /**<Transport error: connection failures, disconnections etc...*/
+	LinphoneReasonIOError, /**<Transport error: connection failures, disconnections etc...*/
+	LinphoneReasonDoNotDistrub /*Do not disturb reason*/
+
 };
 
 /**
diff --git a/coreapi/misc.c b/coreapi/misc.c
index 203d0f461..4960e066f 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -1179,6 +1179,8 @@ SalReason linphone_reason_to_sal(LinphoneReason reason){
 			return SalReasonMedia;
 		case LinphoneReasonIOError:
 			return SalReasonServiceUnavailable;
+		case LinphoneReasonDoNotDistrub:
+			return SalReasonDoNotDisturb;
 	}
 	return SalReasonUnknown;
 }
@@ -1196,7 +1198,7 @@ LinphoneReason linphone_reason_from_sal(SalReason r){
 			ret=LinphoneReasonDeclined;
 			break;
 		case SalReasonDoNotDisturb:
-			ret=LinphoneReasonDeclined;
+			ret=LinphoneReasonDoNotDistrub;
 			break;
 		case SalReasonForbidden:
 			ret=LinphoneReasonBadCredentials;
diff --git a/java/common/org/linphone/core/Reason.java b/java/common/org/linphone/core/Reason.java
index b07686aa2..0b6211c90 100644
--- a/java/common/org/linphone/core/Reason.java
+++ b/java/common/org/linphone/core/Reason.java
@@ -32,7 +32,19 @@ public class Reason {
 	 * Call not answered (in time).
 	 */
 	static public Reason Busy = new Reason(6,"Busy");
-	
+	/**
+	 * Incompatible media
+	 * */
+	static public Reason Media = new Reason(7,"Media");
+	/**
+	 * Transport error: connection failures, disconnections etc...
+	 * */
+	static public Reason IOError = new Reason(8,"IOError");
+	/**
+	 * Transport error: connection failures, disconnections etc...
+	 * */
+	static public Reason DoNotDistrub = new Reason(9,"DoNotDistrub");
+		
 	protected final int mValue;
 	private final String mStringValue;