[ekiga] Fix benign bug in DTMF

[Eugen Dedu <ededu src gnome org>]

commit 7ee697bae47644f19b3e291acccea355f5808672
Author: Eugen Dedu <eugen dedu univ-fcomte fr>
Date:   Wed Jan 13 17:23:49 2016 +0100

    Fix benign bug in DTMF
    
    get_dtmf function, where the bug lies, is not used currently.

 lib/engine/components/opal/h323-call-manager.cpp |   18 ++++++++----------
 lib/engine/components/opal/sip-call-manager.cpp  |   12 +++++-------
 2 files changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/lib/engine/components/opal/h323-call-manager.cpp 
b/lib/engine/components/opal/h323-call-manager.cpp
index 43273f1..557f6c3 100644
--- a/lib/engine/components/opal/h323-call-manager.cpp
+++ b/lib/engine/components/opal/h323-call-manager.cpp
@@ -165,19 +165,17 @@ Opal::H323::CallManager::set_dtmf_mode (unsigned mode)
 unsigned
 Opal::H323::CallManager::get_dtmf_mode () const
 {
-  if (h323_endpoint.GetSendUserInputMode () == OpalConnection::SendUserInputAsString)
+  switch (h323_endpoint.GetSendUserInputMode ()) {
+  case OpalConnection::SendUserInputAsString:
     return 0;
-
-  if (h323_endpoint.GetSendUserInputMode () == OpalConnection::SendUserInputAsTone)
+  case OpalConnection::SendUserInputAsTone:
     return 1;
-
-  if (h323_endpoint.GetSendUserInputMode () == OpalConnection::SendUserInputAsInlineRFC2833)
-    return 2;
-
-  if (h323_endpoint.GetSendUserInputMode () == OpalConnection::SendUserInputAsQ931)
+  case OpalConnection::SendUserInputAsQ931:
+    return 3;
+  case OpalConnection::SendUserInputAsInlineRFC2833:
+  default:
     return 2;
-
-  g_return_val_if_reached (1);
+  }
 }
 
 
diff --git a/lib/engine/components/opal/sip-call-manager.cpp b/lib/engine/components/opal/sip-call-manager.cpp
index b12cb9b..3d48a0b 100644
--- a/lib/engine/components/opal/sip-call-manager.cpp
+++ b/lib/engine/components/opal/sip-call-manager.cpp
@@ -171,15 +171,13 @@ Opal::Sip::CallManager::set_dtmf_mode (unsigned mode)
 unsigned
 Opal::Sip::CallManager::get_dtmf_mode () const
 {
-  // RFC2833
-  if (sip_endpoint.GetSendUserInputMode () == OpalConnection::SendUserInputAsInlineRFC2833)
+  switch (sip_endpoint.GetSendUserInputMode ()) {
+  case OpalConnection::SendUserInputAsInlineRFC2833:  // RFC2833
     return 0;
-
-  // SIP Info
-  if (sip_endpoint.GetSendUserInputMode () == OpalConnection::SendUserInputAsTone)
+  case OpalConnection::SendUserInputAsTone:  // SIP Info
+  default:
     return 1;
-
-  g_return_val_if_reached (1);
+  }
 }