[ekiga/gnome-2-26] Fixed bug #594433.

[Damien Sandras <dsandras src gnome org>]

commit 6d64849b3697e2dde5f678bffef07396f4a0d7a6
Author: Damien Sandras <dsandras seconix com>
Date:   Sun Sep 13 17:37:23 2009 +0200

    Fixed bug #594433.
    
    It is now possible to register dsandras ekiga net as user name to ipness.net.
    This is another form of SIP registration similar to a proxy. The correct way
    to work would be to use a proxy, but some providers do not document things that
    way leading to user confusion.

 lib/engine/components/opal/opal-account.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/lib/engine/components/opal/opal-account.cpp b/lib/engine/components/opal/opal-account.cpp
index 6d45e2c..9483868 100644
--- a/lib/engine/components/opal/opal-account.cpp
+++ b/lib/engine/components/opal/opal-account.cpp
@@ -195,7 +195,10 @@ const std::string Opal::Account::get_aor () const
 {
   std::stringstream str;
 
-  str << (protocol_name == "SIP" ? "sip:" : "h323:") << username << "@" << host;
+  str << (protocol_name == "SIP" ? "sip:" : "h323:") << username;
+
+  if (username.find ("@") == string::npos)
+    str << "@" << host;
 
   return str.str ();
 }