ekiga r7437 - in branches/gnome-2-24: . src/endpoints src/gui

[dsandras svn gnome org]

Author: dsandras
Date: Sat Dec  6 11:09:10 2008
New Revision: 7437
URL: http://svn.gnome.org/viewvc/ekiga?rev=7437&view=rev

Log:
Fixed disable* builds.


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/src/endpoints/opal-gmconf-bridge.cpp
   branches/gnome-2-24/src/gui/accounts.cpp
   branches/gnome-2-24/src/gui/conf.cpp
   branches/gnome-2-24/src/gui/preferences.cpp

Modified: branches/gnome-2-24/src/endpoints/opal-gmconf-bridge.cpp
==============================================================================
--- branches/gnome-2-24/src/endpoints/opal-gmconf-bridge.cpp	(original)
+++ branches/gnome-2-24/src/endpoints/opal-gmconf-bridge.cpp	Sat Dec  6 11:09:10 2008
@@ -41,8 +41,14 @@
 #include "opal-gmconf-bridge.h"
 
 #include "manager.h"
+
+#ifdef HAVE_SIP
 #include "sip-endpoint.h"
+#endif
+
+#ifdef HAVE_H323
 #include "h323-endpoint.h"
+#endif
 
 using namespace Opal;
 

Modified: branches/gnome-2-24/src/gui/accounts.cpp
==============================================================================
--- branches/gnome-2-24/src/gui/accounts.cpp	(original)
+++ branches/gnome-2-24/src/gui/accounts.cpp	Sat Dec  6 11:09:10 2008
@@ -50,8 +50,6 @@
 #include "preferences.h"
 
 #include "manager.h"
-#include "sip-endpoint.h"
-#include "h323-endpoint.h"
 #include "ekiga.h"
 
 #include "gmconf.h"

Modified: branches/gnome-2-24/src/gui/conf.cpp
==============================================================================
--- branches/gnome-2-24/src/gui/conf.cpp	(original)
+++ branches/gnome-2-24/src/gui/conf.cpp	Sat Dec  6 11:09:10 2008
@@ -45,8 +45,6 @@
 
 #include "conf.h"
 
-#include "h323-endpoint.h"
-#include "sip-endpoint.h"
 #include "manager.h"
 
 #include "ekiga.h"

Modified: branches/gnome-2-24/src/gui/preferences.cpp
==============================================================================
--- branches/gnome-2-24/src/gui/preferences.cpp	(original)
+++ branches/gnome-2-24/src/gui/preferences.cpp	Sat Dec  6 11:09:10 2008
@@ -42,8 +42,6 @@
 #include "preferences.h"
 
 #include "accounts.h"
-#include "h323-endpoint.h"
-#include "sip-endpoint.h"
 #include "ekiga.h"
 #include "misc.h"
 #include "callbacks.h"