ekiga r7368 - in trunk: . src src/components src/endpoints src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Sun Nov 16 10:51:04 2008
New Revision: 7368
URL: http://svn.gnome.org/viewvc/ekiga?rev=7368&view=rev

Log:
Headers cleanups and some renaming. Some components were still depending
on engine components instead of engine skel files.


Added:
   trunk/src/endpoints/opal-call-manager.cpp   (contents, props changed)
      - copied, changed from r7356, /trunk/src/endpoints/manager.cpp
   trunk/src/endpoints/opal-call-manager.h   (props changed)
      - copied unchanged from r7356, /trunk/src/endpoints/manager.h
   trunk/src/endpoints/pcss-endpoint.cpp   (contents, props changed)
      - copied, changed from r7356, /trunk/src/endpoints/pcss.cpp
   trunk/src/endpoints/pcss-endpoint.h   (props changed)
      - copied unchanged from r7356, /trunk/src/endpoints/pcss.h
Removed:
   trunk/src/endpoints/manager.cpp
   trunk/src/endpoints/manager.h
   trunk/src/endpoints/pcss.cpp
   trunk/src/endpoints/pcss.h
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/components/dbus.cpp
   trunk/src/endpoints/ekiga.h
   trunk/src/endpoints/h323-endpoint.h
   trunk/src/endpoints/opal-gmconf-bridge.cpp
   trunk/src/endpoints/opal-main.cpp
   trunk/src/endpoints/sip-endpoint.h
   trunk/src/gui/accounts.cpp
   trunk/src/gui/callbacks.cpp
   trunk/src/gui/conf.cpp
   trunk/src/gui/statusicon.h

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Nov 16 10:51:04 2008
@@ -94,10 +94,10 @@
 ekiga_SOURCES +=				\
 	endpoints/ekiga.h			\
 	endpoints/ekiga.cpp			\
-	endpoints/manager.h			\
-	endpoints/manager.cpp			\
-	endpoints/pcss.h			\
-	endpoints/pcss.cpp			\
+	endpoints/opal-call-manager.h		\
+	endpoints/opal-call-manager.cpp		\
+	endpoints/pcss-endpoint.h		\
+	endpoints/pcss-endpoint.cpp		\
 	endpoints/opal-account.h		\
 	endpoints/opal-account.cpp		\
 	endpoints/opal-bank.h			\
@@ -191,4 +191,4 @@
 CLEANFILES = \
 	$(service_DATA)
 
-DISTCLEANFILES = revision.h
\ No newline at end of file
+DISTCLEANFILES = revision.h

Modified: trunk/src/components/dbus.cpp
==============================================================================
--- trunk/src/components/dbus.cpp	(original)
+++ trunk/src/components/dbus.cpp	Sun Nov 16 10:51:04 2008
@@ -49,7 +49,6 @@
 #include "callbacks.h"
 #include "misc.h"
 #include "accounts.h"
-#include "manager.h"
 
 #include "call-core.h"
 

Modified: trunk/src/endpoints/ekiga.h
==============================================================================
--- trunk/src/endpoints/ekiga.h	(original)
+++ trunk/src/endpoints/ekiga.h	Sun Nov 16 10:51:04 2008
@@ -42,7 +42,6 @@
 #include "config.h"
 
 #include "common.h"
-#include "manager.h"
 
 #include "services.h"
 #include "runtime-glib.h"

Modified: trunk/src/endpoints/h323-endpoint.h
==============================================================================
--- trunk/src/endpoints/h323-endpoint.h	(original)
+++ trunk/src/endpoints/h323-endpoint.h	Sun Nov 16 10:51:04 2008
@@ -43,10 +43,16 @@
 
 #include "common.h"
 
-#include "manager.h"
-#include "opal-account.h"
+#include "call-core.h"
 #include "account-core.h"
+#include "presence-core.h"
+#include "contact-core.h"
+#include "call-manager.h"
+#include "runtime.h"
+#include "services.h"
+#include "opal-account.h"
 
+#include "opal-call-manager.h"
 
 namespace Opal {
 

Copied: trunk/src/endpoints/opal-call-manager.cpp (from r7356, /trunk/src/endpoints/manager.cpp)
==============================================================================
--- /trunk/src/endpoints/manager.cpp	(original)
+++ trunk/src/endpoints/opal-call-manager.cpp	Sun Nov 16 10:51:04 2008
@@ -39,9 +39,9 @@
 
 #include "config.h"
 
-#include "manager.h"
+#include "opal-call-manager.h"
 
-#include "pcss.h"
+#include "pcss-endpoint.h"
 
 #include "call-core.h"
 #include "opal-call.h"

Modified: trunk/src/endpoints/opal-gmconf-bridge.cpp
==============================================================================
--- trunk/src/endpoints/opal-gmconf-bridge.cpp	(original)
+++ trunk/src/endpoints/opal-gmconf-bridge.cpp	Sun Nov 16 10:51:04 2008
@@ -38,9 +38,10 @@
 #include <sigc++/sigc++.h>
 
 #include "gmconf.h"
+
 #include "opal-gmconf-bridge.h"
+#include "opal-call-manager.h"
 
-#include "manager.h"
 #include "sip-endpoint.h"
 #include "h323-endpoint.h"
 

Modified: trunk/src/endpoints/opal-main.cpp
==============================================================================
--- trunk/src/endpoints/opal-main.cpp	(original)
+++ trunk/src/endpoints/opal-main.cpp	Sun Nov 16 10:51:04 2008
@@ -44,9 +44,7 @@
 #include "opal-gmconf-bridge.h"
 #include "opal-account.h"
 #include "opal-bank.h"
-
-#include "manager.h"
-#include "ekiga.h"
+#include "opal-call-manager.h"
 
 #ifdef HAVE_SIP
 #include "sip-endpoint.h"

Copied: trunk/src/endpoints/pcss-endpoint.cpp (from r7356, /trunk/src/endpoints/pcss.cpp)
==============================================================================
--- /trunk/src/endpoints/pcss.cpp	(original)
+++ trunk/src/endpoints/pcss-endpoint.cpp	Sun Nov 16 10:51:04 2008
@@ -38,8 +38,8 @@
 
 #include "common.h"
 
-#include "pcss.h"
-#include "manager.h"
+#include "pcss-endpoint.h"
+#include "opal-call-manager.h"
 
 #include "call.h"
 

Modified: trunk/src/endpoints/sip-endpoint.h
==============================================================================
--- trunk/src/endpoints/sip-endpoint.h	(original)
+++ trunk/src/endpoints/sip-endpoint.h	Sun Nov 16 10:51:04 2008
@@ -44,14 +44,18 @@
 
 #include "common.h"
 
-#include "manager.h"
 #include "presence-core.h"
 #include "call-manager.h"
 #include "call-protocol-manager.h"
 #include "account-core.h"
 #include "opal-account.h"
 #include "sip-dialect.h"
+#include "call-core.h"
+#include "contact-core.h"
+#include "runtime.h"
+#include "services.h"
 
+#include "opal-call-manager.h"
 
 PDICTIONARY (msgDict, PString, PString);
 

Modified: trunk/src/gui/accounts.cpp
==============================================================================
--- trunk/src/gui/accounts.cpp	(original)
+++ trunk/src/gui/accounts.cpp	Sun Nov 16 10:51:04 2008
@@ -49,11 +49,6 @@
 #include "main.h"
 #include "preferences.h"
 
-#include "manager.h"
-#include "sip-endpoint.h"
-#include "h323-endpoint.h"
-#include "ekiga.h"
-
 #include "gmconf.h"
 #include "gmdialog.h"
 

Modified: trunk/src/gui/callbacks.cpp
==============================================================================
--- trunk/src/gui/callbacks.cpp	(original)
+++ trunk/src/gui/callbacks.cpp	Sun Nov 16 10:51:04 2008
@@ -40,10 +40,11 @@
 #include "config.h"
 
 #include "callbacks.h"
-#include "ekiga.h"
 #include "main.h"
 #include "misc.h"
 
+#include "ekiga.h"
+
 #include "gmentrydialog.h"
 #include "gmconf.h"
 #include "gmdialog.h"

Modified: trunk/src/gui/conf.cpp
==============================================================================
--- trunk/src/gui/conf.cpp	(original)
+++ trunk/src/gui/conf.cpp	Sun Nov 16 10:51:04 2008
@@ -45,10 +45,6 @@
 
 #include "conf.h"
 
-#include "h323-endpoint.h"
-#include "sip-endpoint.h"
-#include "manager.h"
-
 #include "ekiga.h"
 #include "preferences.h"
 #include "assistant.h"

Modified: trunk/src/gui/statusicon.h
==============================================================================
--- trunk/src/gui/statusicon.h	(original)
+++ trunk/src/gui/statusicon.h	Sun Nov 16 10:51:04 2008
@@ -39,7 +39,6 @@
 #define _STATUSICON_H_
 
 #include "common.h"
-#include "manager.h"
 #include "services.h"