ekiga r6892 - in trunk/src: . endpoints

[jpuydt svn gnome org]

Author: jpuydt
Date: Tue Sep  9 15:30:09 2008
New Revision: 6892
URL: http://svn.gnome.org/viewvc/ekiga?rev=6892&view=rev

Log:
Removed SIP::Presentity and used Ekiga::URIPresentity instead

Removed:
   trunk/src/endpoints/sip-presentity.cpp
   trunk/src/endpoints/sip-presentity.h
Modified:
   trunk/src/Makefile.am
   trunk/src/endpoints/sip-chat-simple.cpp
   trunk/src/endpoints/sip-chat-simple.h

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Sep  9 15:30:09 2008
@@ -116,8 +116,6 @@
 
 if HAVE_SIP
 ekiga_SOURCES +=		\
-	endpoints/sip-presentity.h		\
-	endpoints/sip-presentity.cpp		\
 	endpoints/sip-chat-simple.h		\
 	endpoints/sip-chat-simple.cpp		\
 	endpoints/sip-dialect.h			\

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  9 15:30:09 2008
@@ -36,7 +36,7 @@
  */
 
 #include "sip-chat-simple.h"
-
+#include "uri-presentity.h"
 #include "personal-details.h"
 
 SIP::SimpleChat::SimpleChat (Ekiga::ServiceCore& core_,
@@ -45,7 +45,7 @@
 			     sigc::slot<bool, std::string> sender_)
   : core(core_), sender(sender_)
 {
-  presentity = new Presentity (core, name, uri);
+  presentity = new Ekiga::URIPresentity (core, name, uri);
 }
 
 SIP::SimpleChat::~SimpleChat ()

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  9 15:30:09 2008
@@ -39,7 +39,7 @@
 #define __SIP_CHAT_SIMPLE_H__
 
 #include "chat-simple.h"
-#include "sip-presentity.h"
+#include "services.h"
 
 namespace SIP
 {
@@ -76,7 +76,7 @@
     Ekiga::ServiceCore& core;
     sigc::slot<bool, std::string> sender;
     std::list<Ekiga::ChatObserver*> observers;
-    Presentity *presentity;
+    Ekiga::Presentity *presentity;
   };
 };