ekiga r7425 - in trunk: . lib/engine/components/opal src src/components src/dbus-helper src/gui
- From: dsandras svn gnome org
- To: svn-commits-list gnome org
- Subject: ekiga r7425 - in trunk: . lib/engine/components/opal src src/components src/dbus-helper src/gui
- Date: Tue, 2 Dec 2008 21:17:06 +0000 (UTC)
Author: dsandras
Date: Tue Dec 2 21:17:06 2008
New Revision: 7425
URL: http://svn.gnome.org/viewvc/ekiga?rev=7425&view=rev
Log:
Moved to dbus-helper.
Added:
trunk/src/dbus-helper/ (props changed)
- copied from r7424, /trunk/src/components/
Removed:
trunk/src/components/
Modified:
trunk/ChangeLog
trunk/lib/engine/components/opal/opal-call-manager.cpp
trunk/src/Makefile.am
trunk/src/gui/main.cpp
Modified: trunk/lib/engine/components/opal/opal-call-manager.cpp
==============================================================================
--- trunk/lib/engine/components/opal/opal-call-manager.cpp (original)
+++ trunk/lib/engine/components/opal/opal-call-manager.cpp Tue Dec 2 21:17:06 2008
@@ -105,7 +105,8 @@
{
/* Initialise the endpoint paramaters */
PIPSocket::SetDefaultIpAddressFamilyV4();
- autoStartTransmitVideo = autoStartReceiveVideo = true;
+ SetAutoStartTransmitVideo (true);
+ SetAutoStartReceiveVideo (true);
SetUDPPorts (5000, 5100);
SetTCPPorts (30000, 30100);
SetRtpIpPorts (5000, 5100);
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Tue Dec 2 21:17:06 2008
@@ -21,10 +21,7 @@
-I$(top_srcdir)/lib/engine/gui/gtk-core \
-I$(top_srcdir)/lib/engine/components/opal \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/src/clients/ \
- -I$(top_srcdir)/src/components/ \
- -I$(top_srcdir)/src/devices/ \
- -I$(top_srcdir)/src/endpoints/ \
+ -I$(top_srcdir)/src/dbus-helper/ \
-I$(top_srcdir)/src/gui/ \
-I$(top_builddir) \
$(GNOME_INCLUDEDIR) \
@@ -88,36 +85,36 @@
if HAVE_DBUS
ekiga_SOURCES += \
- components/dbus-stub.h \
- components/dbus.h \
- components/dbus.cpp
+ dbus-helper/dbus-stub.h \
+ dbus-helper/dbus.h \
+ dbus-helper/dbus.cpp
bin_PROGRAMS += ekiga-helper
ekiga_helper_SOURCES = \
- components/dbus-helper-stub.h \
- components/dbus-helper.cpp
+ dbus-helper/dbus-helper-stub.h \
+ dbus-helper/dbus-helper.cpp
ekiga_helper_LDADD = $(DBUS_LIBS)
-BUILT_SOURCES += components/dbus-helper-stub.h components/dbus-stub.h
+BUILT_SOURCES += dbus-helper/dbus-helper-stub.h dbus-helper/dbus-stub.h
-components/dbus-helper-stub.h: components/dbus-helper-stub.xml
+dbus-helper/dbus-helper-stub.h: dbus-helper/dbus-helper-stub.xml
$(LIBTOOL) --mode=execute dbus-binding-tool --prefix=helper --mode=glib-server --output=$@ $^
-components/dbus-stub.h: components/dbus-stub.xml
+dbus-helper/dbus-stub.h: dbus-helper/dbus-stub.xml
$(LIBTOOL) --mode=execute dbus-binding-tool --prefix=ekiga_dbus_component --mode=glib-server --output=$@ $^
endif
if INSTALL_DBUS_SERVICE
%.service: %.service.in
- $(mkdir_p) components # this is ugly...
+ $(mkdir_p) dbus-helper # this is ugly...
sed -e "s#\ bindir\@# bindir@#" $< > $@
servicedir = $(datadir)/dbus-1/services
-service_DATA = components/org.ekiga.Ekiga.service components/org.ekiga.Helper.service
+service_DATA = dbus-helper/org.ekiga.Ekiga.service dbus-helper/org.ekiga.Helper.service
service_in_files = $(service_DATA:.service=.service.in)
endif
@@ -144,8 +141,8 @@
EXTRA_DIST = \
$(service_in_files) \
- components/dbus-stub.xml \
- components/dbus-helper-stub.xml
+ dbus-helper/dbus-stub.xml \
+ dbus-helper/dbus-helper-stub.xml
CLEANFILES = \
$(service_DATA)
Modified: trunk/src/gui/main.cpp
==============================================================================
--- trunk/src/gui/main.cpp (original)
+++ trunk/src/gui/main.cpp Tue Dec 2 21:17:06 2008
@@ -70,7 +70,7 @@
#include <gdk/gdkkeysyms.h>
#ifdef HAVE_DBUS
-#include "components/dbus.h"
+#include "dbus-helper/dbus.h"
#endif
#ifndef WIN32
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]