ekiga r7054 - in trunk: . lib/engine/presence/skel src/endpoints

[jpuydt svn gnome org]

Author: jpuydt
Date: Tue Sep 23 05:51:21 2008
New Revision: 7054
URL: http://svn.gnome.org/viewvc/ekiga?rev=7054&view=rev

Log:
Got rid of the get_uri method in Ekiga::Presentity, fixing bug #552547.

Modified:
   trunk/ChangeLog
   trunk/lib/engine/presence/skel/presentity.h
   trunk/lib/engine/presence/skel/proxy-presentity.cpp
   trunk/lib/engine/presence/skel/proxy-presentity.h
   trunk/src/endpoints/sip-chat-simple.cpp
   trunk/src/endpoints/sip-chat-simple.h

Modified: trunk/lib/engine/presence/skel/presentity.h
==============================================================================
--- trunk/lib/engine/presence/skel/presentity.h	(original)
+++ trunk/lib/engine/presence/skel/presentity.h	Tue Sep 23 05:51:21 2008
@@ -86,11 +86,6 @@
      */
     virtual const std::set<std::string> get_groups () const = 0;
 
-    /** Returns the uri of the Presentity.
-     * @return The presentity's uri.
-     */
-    virtual const std::string get_uri () const = 0;
-
     /** Populates a menu with the actions possible on the Presentity.
      * @param The builder to populate.
      */

Modified: trunk/lib/engine/presence/skel/proxy-presentity.cpp
==============================================================================
--- trunk/lib/engine/presence/skel/proxy-presentity.cpp	(original)
+++ trunk/lib/engine/presence/skel/proxy-presentity.cpp	Tue Sep 23 05:51:21 2008
@@ -76,12 +76,6 @@
   return presentity.get_groups ();
 }
 
-const std::string
-Ekiga::ProxyPresentity::get_uri () const
-{
-  return presentity.get_uri ();
-}
-
 bool
 Ekiga::ProxyPresentity::populate_menu (Ekiga::MenuBuilder &builder)
 {

Modified: trunk/lib/engine/presence/skel/proxy-presentity.h
==============================================================================
--- trunk/lib/engine/presence/skel/proxy-presentity.h	(original)
+++ trunk/lib/engine/presence/skel/proxy-presentity.h	Tue Sep 23 05:51:21 2008
@@ -84,8 +84,6 @@
 
     const std::set<std::string> get_groups () const;
 
-    const std::string get_uri () const;
-
     /** Populates the given Ekiga::MenuBuilder with the actions.
      * @param: A MenuBuilder.
      */

Modified: trunk/src/endpoints/sip-chat-simple.cpp
==============================================================================
--- trunk/src/endpoints/sip-chat-simple.cpp	(original)
+++ trunk/src/endpoints/sip-chat-simple.cpp	Tue Sep 23 05:51:21 2008
@@ -41,9 +41,9 @@
 
 SIP::SimpleChat::SimpleChat (Ekiga::ServiceCore& core_,
 			     std::string name,
-			     std::string uri,
+			     std::string uri_,
 			     sigc::slot<bool, std::string> sender_)
-  : core(core_), sender(sender_)
+  : core(core_), sender(sender_), uri(uri_)
 {
   presentity = new Ekiga::URIPresentity (core, name, uri,
 					 std::set<std::string>());
@@ -58,7 +58,7 @@
 const std::string
 SIP::SimpleChat::get_uri () const
 {
-  return presentity->get_uri ();
+  return uri;
 }
 
 const std::string

Modified: trunk/src/endpoints/sip-chat-simple.h
==============================================================================
--- trunk/src/endpoints/sip-chat-simple.h	(original)
+++ trunk/src/endpoints/sip-chat-simple.h	Tue Sep 23 05:51:21 2008
@@ -77,6 +77,7 @@
     sigc::slot<bool, std::string> sender;
     std::list<Ekiga::ChatObserver*> observers;
     Ekiga::Presentity *presentity;
+    std::string uri;
   };
 };