[ekiga/gnome-2-26] On failed registration, do not show the unuseful RequestTerminated

[Eugen Dedu <ededu src gnome org>]

commit 1720fccb569e6661e5a253c4a21ee10a78183745
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Mon Apr 27 18:27:08 2009 +0200

    On failed registration, do not show the unuseful RequestTerminated
---
 lib/engine/components/opal/sip-endpoint.cpp |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/engine/components/opal/sip-endpoint.cpp b/lib/engine/components/opal/sip-endpoint.cpp
index 68052c6..2d99191 100644
--- a/lib/engine/components/opal/sip-endpoint.cpp
+++ b/lib/engine/components/opal/sip-endpoint.cpp
@@ -909,13 +909,18 @@ void Opal::Sip::EndPoint::OnRegistrationFailed (const PString & _aor,
   /* Signal the SIP Endpoint */
   SIPEndPoint::OnRegistrationFailed (strm.str ().c_str (), r, wasRegistering);
 
-  /* Signal */
-  Opal::Account *account = bank->find_account (strm.str ());
-  if (account)
-    Ekiga::Runtime::run_in_main (sigc::bind (sigc::ptr_fun(registration_event_in_main),
+  /* opal adds a RequestTerminated, and this should not be shown to user,
+  * as a sip code has already been scheduled to be shown
+  */
+  if (r != SIP_PDU::Failure_RequestTerminated) {
+    /* Signal */
+    Opal::Account *account = bank->find_account (strm.str ());
+    if (account)
+      Ekiga::Runtime::run_in_main (sigc::bind (sigc::ptr_fun(registration_event_in_main),
 				      account->registration_event.make_slot (),
 				      wasRegistering ? Ekiga::AccountCore::RegistrationFailed : Ekiga::AccountCore::UnregistrationFailed,
 				      info));
+  }
 }