[ekiga] Fixed remote uri not being shown in the uri bar when dialing out.

[Damien Sandras <dsandras src gnome org>]

commit 862d2f203508ba13cf11a2fe3b674cde438a6f1d
Author: Damien Sandras <dsandras seconix com>
Date:   Sun May 17 15:05:29 2009 +0200

    Fixed remote uri not being shown in the uri bar when dialing out.
    
    Now give a new argument to setupcall so that we have the remote uri
    when dialing out.
---
 lib/engine/components/opal/h323-endpoint.cpp     |   58 +++++++++++-----------
 lib/engine/components/opal/opal-call-manager.cpp |    4 +-
 lib/engine/components/opal/opal-call-manager.h   |    2 +-
 lib/engine/components/opal/opal-call.cpp         |    4 +-
 lib/engine/components/opal/opal-call.h           |    8 ++--
 lib/engine/components/opal/sip-endpoint.cpp      |    2 +-
 6 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/lib/engine/components/opal/h323-endpoint.cpp b/lib/engine/components/opal/h323-endpoint.cpp
index 6349e22..d9e5699 100644
--- a/lib/engine/components/opal/h323-endpoint.cpp
+++ b/lib/engine/components/opal/h323-endpoint.cpp
@@ -51,23 +51,23 @@ namespace Opal {
     {
       PCLASSINFO(subscriber, PThread);
 
-    public:
+  public:
 
       subscriber (const Opal::Account & _account,
                   Opal::H323::EndPoint& _manager)
         : PThread (1000, AutoDeleteThread),
-	  account (_account),
-	  manager (_manager)
+        account (_account),
+        manager (_manager)
       {
         this->Resume ();
       };
 
       void Main ()
-      {
-	manager.Register (account);
-      };
+        {
+          manager.Register (account);
+        };
 
-    private:
+  private:
       const Opal::Account & account;
       Opal::H323::EndPoint& manager;
     };
@@ -77,7 +77,7 @@ namespace Opal {
 
 /* The class */
 Opal::H323::EndPoint::EndPoint (Opal::CallManager & _manager, Ekiga::ServiceCore & _core, unsigned _listen_port)
-  : H323EndPoint (_manager),
+: H323EndPoint (_manager),
     manager (_manager),
     core (_core)
 {
@@ -102,8 +102,8 @@ Opal::H323::EndPoint::~EndPoint ()
 
 bool
 Opal::H323::EndPoint::populate_menu (Ekiga::ContactPtr contact,
-				     std::string uri,
-				     Ekiga::MenuBuilder &builder)
+                                     std::string uri,
+                                     Ekiga::MenuBuilder &builder)
 {
   return menu_builder_add_actions (contact->get_name (), uri, builder);
 }
@@ -111,8 +111,8 @@ Opal::H323::EndPoint::populate_menu (Ekiga::ContactPtr contact,
 
 bool
 Opal::H323::EndPoint::populate_menu (Ekiga::PresentityPtr presentity,
-				     const std::string uri,
-				     Ekiga::MenuBuilder& builder)
+                                     const std::string uri,
+                                     Ekiga::MenuBuilder& builder)
 {
   return menu_builder_add_actions (presentity->get_name (), uri, builder);
 }
@@ -120,8 +120,8 @@ Opal::H323::EndPoint::populate_menu (Ekiga::PresentityPtr presentity,
 
 bool
 Opal::H323::EndPoint::menu_builder_add_actions (const std::string & /*fullname*/,
-						const std::string& uri,
-						Ekiga::MenuBuilder & builder)
+                                                const std::string& uri,
+                                                Ekiga::MenuBuilder & builder)
 {
   bool populated = false;
 
@@ -146,7 +146,7 @@ Opal::H323::EndPoint::dial (const std::string&  uri)
   if (uri.find ("h323:") == 0) {
 
     PString token;
-    manager.SetUpCall("pc:*", uri, token);
+    manager.SetUpCall("pc:*", uri, token, (void*) uri.c_str());
 
     return true;
   }
@@ -332,38 +332,38 @@ Opal::H323::EndPoint::Register (const Opal::Account& account)
 
       // Signal
       Ekiga::Runtime::run_in_main (sigc::bind (sigc::mem_fun (this, &Opal::H323::EndPoint::registration_event_in_main),
-					       account,
-					       Ekiga::Account::RegistrationFailed,
-					       info));
+                                               account,
+                                               Ekiga::Account::RegistrationFailed,
+                                               info));
     }
     else {
 
       Ekiga::Runtime::run_in_main (sigc::bind (sigc::mem_fun (this, &Opal::H323::EndPoint::registration_event_in_main),
-					       account,
-					       Ekiga::Account::Registered,
-					       std::string ()));
+                                               account,
+                                               Ekiga::Account::Registered,
+                                               std::string ()));
     }
   }
   else if (unregister && IsRegisteredWithGatekeeper (account.get_host ())) {
     /*
 
-    H323EndPoint::RemoveGatekeeper (0);
-    RemoveAliasName (account.get_username ());
+       H323EndPoint::RemoveGatekeeper (0);
+       RemoveAliasName (account.get_username ());
 
     // Signal 
     Ekiga::Runtime::run_in_main (sigc::bind (sigc::mem_fun (this, &Opal::H323::EndPoint::registration_event_in_main),
-					     account,
-					     Ekiga::Account::Unregistered,
-					     std::string ()));
-                                             */
+    account,
+    Ekiga::Account::Unregistered,
+    std::string ()));
+     */
   }
 }
 
 
 bool
 Opal::H323::EndPoint::UseGatekeeper (const PString & address,
-				     const PString & domain,
-				     const PString & iface)
+                                     const PString & domain,
+                                     const PString & iface)
 {
   bool result =
     H323EndPoint::UseGatekeeper (address, domain, iface);
diff --git a/lib/engine/components/opal/opal-call-manager.cpp b/lib/engine/components/opal/opal-call-manager.cpp
index 5e00134..b5c577d 100644
--- a/lib/engine/components/opal/opal-call-manager.cpp
+++ b/lib/engine/components/opal/opal-call-manager.cpp
@@ -630,11 +630,11 @@ void CallManager::get_video_options (CallManager::VideoOptions & options) const
 }
 
 
-OpalCall *CallManager::CreateCall ()
+OpalCall *CallManager::CreateCall (void *uri)
 {
   gmref_ptr<Ekiga::CallCore> call_core = core.get ("call-core"); // FIXME: threaded?
 
-  gmref_ptr<Opal::Call> call (new Opal::Call (*this, core));
+  gmref_ptr<Opal::Call> call (new Opal::Call (*this, core, (const char *) uri));
   call_core->add_call (call, gmref_ptr<CallManager>(this));
 
   return call.get ();
diff --git a/lib/engine/components/opal/opal-call-manager.h b/lib/engine/components/opal/opal-call-manager.h
index 357265f..9f61c1a 100644
--- a/lib/engine/components/opal/opal-call-manager.h
+++ b/lib/engine/components/opal/opal-call-manager.h
@@ -155,7 +155,7 @@ public:
     void get_video_options (VideoOptions & options) const;
 
 private:
-    OpalCall *CreateCall ();
+    OpalCall *CreateCall (void *uri);
     void DestroyCall (OpalCall *);
 
     bool OnOpenMediaStream (OpalConnection &,
diff --git a/lib/engine/components/opal/opal-call.cpp b/lib/engine/components/opal/opal-call.cpp
index ae873f4..9072d80 100644
--- a/lib/engine/components/opal/opal-call.cpp
+++ b/lib/engine/components/opal/opal-call.cpp
@@ -91,8 +91,8 @@ private:
 };
 
 
-Opal::Call::Call (OpalManager & _manager, Ekiga::ServiceCore & _core)
-  : OpalCall (_manager), Ekiga::Call (), core (_core),
+Opal::Call::Call (OpalManager & _manager, Ekiga::ServiceCore & _core, const std::string& uri)
+  : OpalCall (_manager), Ekiga::Call (), core (_core), remote_uri (uri),
     call_setup(false),outgoing(true),jitter(0)
 {
   re_a_bytes = tr_a_bytes = re_v_bytes = tr_v_bytes = 0.0;
diff --git a/lib/engine/components/opal/opal-call.h b/lib/engine/components/opal/opal-call.h
index d5f9c31..bcd63d3 100644
--- a/lib/engine/components/opal/opal-call.h
+++ b/lib/engine/components/opal/opal-call.h
@@ -57,7 +57,7 @@ namespace Opal {
 
 public:
 
-    Call (OpalManager & _manager, Ekiga::ServiceCore & _core);
+    Call (OpalManager & _manager, Ekiga::ServiceCore & _core, const std::string & uri);
 
     ~Call ();
 
@@ -206,14 +206,14 @@ private:
      */
     Ekiga::ServiceCore & core;
 
-
-    bool call_setup;
-    bool outgoing;
     std::string local_party_name;
     std::string remote_party_name;
     std::string remote_uri;
     std::string remote_application;
 
+    bool call_setup;
+    bool outgoing;
+
     std::string forward_uri;
 
     double re_a_bw;
diff --git a/lib/engine/components/opal/sip-endpoint.cpp b/lib/engine/components/opal/sip-endpoint.cpp
index a586faf..2af1fc2 100644
--- a/lib/engine/components/opal/sip-endpoint.cpp
+++ b/lib/engine/components/opal/sip-endpoint.cpp
@@ -379,7 +379,7 @@ Opal::Sip::EndPoint::dial (const std::string & uri)
       ustr << uri;
 
     PString token;
-    manager.SetUpCall("pc:*", ustr.str(), token);
+    manager.SetUpCall("pc:*", ustr.str(), token, (void*) ustr.str().c_str());
 
     return true;
   }