[ekiga] Use a fourth registration mode (useful when firewall has ALG)

[Eugen Dedu <ededu src gnome org>]

commit e259f10439a1b1bb32931547401ad958a2f5bf8e
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Mon Apr 23 18:00:29 2012 +0200

    Use a fourth registration mode (useful when firewall has ALG)

 lib/engine/components/opal/opal-account.cpp |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-account.cpp b/lib/engine/components/opal/opal-account.cpp
index 8906917..3cb07dd 100644
--- a/lib/engine/components/opal/opal-account.cpp
+++ b/lib/engine/components/opal/opal-account.cpp
@@ -633,7 +633,6 @@ Opal::Account::handle_registration_event (RegistrationState state_,
   case RegistrationFailed:
 
     switch (compat_mode) {
-    case SIPRegister::e_HasApplicationLayerGateway:
     case SIPRegister::e_FullyCompliant:
       // FullyCompliant did not work, try next compat mode
       compat_mode = SIPRegister::e_CannotRegisterMultipleContacts;
@@ -647,14 +646,20 @@ Opal::Account::handle_registration_event (RegistrationState state_,
       endpoint->subscribe (*this, presentity);
       break;
     case SIPRegister::e_CannotRegisterPrivateContacts:
-      // CannotRegPC did not work, stop registration with error
+      // CannotRegMC did not work, try next compat mode
+      compat_mode = SIPRegister::e_HasApplicationLayerGateway;
+      PTRACE (4, "Register failed in CannotRegisterMultipleContacts mode, retrying in HasApplicationLayerGateway mode");
+      endpoint->subscribe (*this, presentity);
+      break;
+    case SIPRegister::e_HasApplicationLayerGateway:
+      // HasAppLG did not work, stop registration with error
       compat_mode = SIPRegister::e_FullyCompliant;
-      PTRACE (4, "Register failed in CannotRegisterPrivateContacts mode, aborting registration");
+      PTRACE (4, "Register failed in HasApplicationLayerGateway mode, aborting registration");
       status = _("Could not register");
       if (!info.empty ())
         status = status + " (" + info + ")";
       if (!failed_registration_already_notified) {
-	updated ();
+        updated ();
         std::stringstream msg;
         msg << _("Could not register to ") << get_name ();
         boost::shared_ptr<Ekiga::Notification> notif (new Ekiga::Notification (Ekiga::Notification::Warning, msg.str (), info));