ekiga r6345 - in trunk: . src/endpoints

[dsandras svn gnome org]

Author: dsandras
Date: Mon Jun  2 20:01:26 2008
New Revision: 6345
URL: http://svn.gnome.org/viewvc/ekiga?rev=6345&view=rev

Log:
Code simplifications.


Modified:
   trunk/ChangeLog
   trunk/src/endpoints/manager.cpp
   trunk/src/endpoints/manager.h
   trunk/src/endpoints/opal-main.cpp

Modified: trunk/src/endpoints/manager.cpp
==============================================================================
--- trunk/src/endpoints/manager.cpp	(original)
+++ trunk/src/endpoints/manager.cpp	Mon Jun  2 20:01:26 2008
@@ -41,8 +41,6 @@
 
 #include "manager.h"
 
-#include "h323.h"
-#include "sip.h"
 #include "pcss.h"
 
 #include "call-core.h"
@@ -112,7 +110,6 @@
   
   manager = NULL;
 
-  h323EP = NULL;
   pcssEP = NULL;
 
   forward_on_no_answer = false;
@@ -624,13 +621,6 @@
 }
 
 
-GMH323Endpoint *
-GMManager::GetH323Endpoint ()
-{
-  return h323EP;
-}
-
-
 void
 GMManager::Register (GmAccount *account)
 {

Modified: trunk/src/endpoints/manager.h
==============================================================================
--- trunk/src/endpoints/manager.h	(original)
+++ trunk/src/endpoints/manager.h	Mon Jun  2 20:01:26 2008
@@ -60,8 +60,6 @@
 
 
 class GMLid;
-class GMH323Gatekeeper;
-class GMH323Endpoint;
 class GMPCSSEndpoint;
 
 /**
@@ -77,7 +75,6 @@
   PCLASSINFO(GMManager, OpalManager);
 
   friend class GMAccountsEndpoint;
-  friend class GMH323Endpoint;
   
  public:
 
@@ -164,8 +161,6 @@
 
 
   /**/ 
-  GMH323Endpoint *GetH323Endpoint ();
-  
   void Register (GmAccount * = NULL);
 
  private:
@@ -187,10 +182,8 @@
   std::list<std::string> protocols;
 
   /* The various related endpoints */
-  GMH323Endpoint *h323EP;
   GMPCSSEndpoint *pcssEP;
 
-
   /* The various components of the endpoint */
   GMAccountsEndpoint *manager;
 

Modified: trunk/src/endpoints/opal-main.cpp
==============================================================================
--- trunk/src/endpoints/opal-main.cpp	(original)
+++ trunk/src/endpoints/opal-main.cpp	Mon Jun  2 20:01:26 2008
@@ -98,6 +98,7 @@
 
     presence_core->add_presentity_decorator (*sipEP);
     presence_core->add_supported_uri (sigc::ptr_fun (is_sip_address));
+
     presence_core->add_presence_fetcher (*sipEP);
     presence_core->add_presence_publisher (*sipEP);
   }