ekiga r6323 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Mon May 26 20:12:40 2008
New Revision: 6323
URL: http://svn.gnome.org/viewvc/ekiga?rev=6323&view=rev

Log:
Code simplification.


Modified:
   trunk/ChangeLog
   trunk/src/endpoints/sip.cpp
   trunk/src/endpoints/sip.h

Modified: trunk/src/endpoints/sip.cpp
==============================================================================
--- trunk/src/endpoints/sip.cpp	(original)
+++ trunk/src/endpoints/sip.cpp	Mon May 26 20:12:40 2008
@@ -263,7 +263,10 @@
 {
   if (!_uri.empty () && (_uri.find ("sip:") == 0 || _uri.find (':') == string::npos) && !_message.empty ()) {
 
-    Message (_uri.c_str (), _message.c_str ());
+    SIPEndPoint::Message (_uri, _message);
+
+    runtime.run_in_main (sigc::bind (im_sent.make_slot (), _uri, _message));
+
     return true;
   }
 
@@ -843,20 +846,6 @@
 }
 
 
-void
-GMSIPEndpoint::Message (const PString & _to,
-                        const PString & body)
-{
-  SIPEndPoint::Message (_to, body);
-
-  SIPURL to = _to;
-  to.AdjustForRequestURI ();
-  std::string uri = (const char *) to.AsString ();
-  std::string _message = (const char *) body;
-  runtime.run_in_main (sigc::bind (im_sent.make_slot (), uri, _message));
-}
-
-
 SIPURL
 GMSIPEndpoint::GetRegisteredPartyName (const SIPURL & host)
 {

Modified: trunk/src/endpoints/sip.h
==============================================================================
--- trunk/src/endpoints/sip.h	(original)
+++ trunk/src/endpoints/sip.h	Mon May 26 20:12:40 2008
@@ -147,9 +147,6 @@
   void OnMessageFailed (const SIPURL & messageUrl,
                         SIP_PDU::StatusCodes reason);
 
-  void Message (const PString & to,
-                const PString & body);
-
   SIPURL GetRegisteredPartyName (const SIPURL & host);
 
 private: