[ekiga] Fix DTMF signaling

[Eugen Dedu <ededu src gnome org>]

commit d5abac280527b1e05ea123c4ebac2a299a9eb0ac
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Tue Jun 8 18:11:44 2010 +0200

    Fix DTMF signaling
    
    Fixes bug 620662.

 lib/engine/components/opal/sip-endpoint.cpp |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/lib/engine/components/opal/sip-endpoint.cpp b/lib/engine/components/opal/sip-endpoint.cpp
index 8954662..b40d916 100644
--- a/lib/engine/components/opal/sip-endpoint.cpp
+++ b/lib/engine/components/opal/sip-endpoint.cpp
@@ -395,16 +395,14 @@ Opal::Sip::EndPoint::set_dtmf_mode (unsigned mode)
 {
   switch (mode) {
 
-    // SIP Info
-  case 0:
-    SetSendUserInputMode (OpalConnection::SendUserInputAsTone);
+  case 0:  // RFC2833
+    SetSendUserInputMode (OpalConnection::SendUserInputAsInlineRFC2833);
     break;
-
-    // RFC2833
-  case 1:
-    SetSendUserInputMode (OpalConnection::SendUserInputAsProtocolDefault);
+  case 1:  // SIP Info
+    SetSendUserInputMode (OpalConnection::SendUserInputAsTone);
     break;
   default:
+    g_return_if_reached ();
     break;
   }
 }
@@ -413,14 +411,15 @@ Opal::Sip::EndPoint::set_dtmf_mode (unsigned mode)
 unsigned
 Opal::Sip::EndPoint::get_dtmf_mode () const
 {
-  // SIP Info
-  if (GetSendUserInputMode () == OpalConnection::SendUserInputAsTone)
-    return 0;
-
   // RFC2833
   if (GetSendUserInputMode () == OpalConnection::SendUserInputAsInlineRFC2833)
+    return 0;
+
+  // SIP Info
+  if (GetSendUserInputMode () == OpalConnection::SendUserInputAsTone)
     return 1;
 
+  g_return_val_if_reached (1);
   return 1;
 }