Version 1.9.

2005-08-28  Christian Persch  <chpe@cvs.gnome.org>

	* ChangeLog-20050828:
	* Makefile.am:
	* autogen.sh:
	* configure.ac:
	* data/Makefile.am:
	* data/epiphany-1.10.pc.in:
	* data/epiphany-1.8.pc.in:
	* doc/reference/Makefile.am:
	* embed/Makefile.am:
	* embed/mozilla/Makefile.am:
	* lib/Makefile.am:
	* lib/egg/Makefile.am:
	* lib/ephy-dbus.c: (session_filter_func), (system_filter_func),
	(ephy_dbus_connect_to_session_bus), (ephy_dbus_disconnect_bus):
	* lib/widgets/Makefile.am:
	* src/Makefile.am:
	* src/bookmarks/Makefile.am:

	Version 1.9.

4 files changed, 9 insertions, 35 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 79f4fb016..a0473e870 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -28,10 +28,12 @@ NOINST_H_FILES = \
 	ephy-zoom.h
 
 TYPES_H_FILES = \
+	ephy-dbus.h				\
 	ephy-node.h				\
 	ephy-state.h
 
 INST_H_FILES = \
+	ephy-dbus.h				\
 	ephy-dialog.h				\
 	ephy-loader.h				\
 	ephy-node.h				\
@@ -40,6 +42,7 @@ INST_H_FILES = \
 
 libephymisc_la_SOURCES = \
 	eel-gconf-extensions.c			\
+	ephy-dbus.c				\
 	ephy-debug.c				\
 	ephy-dialog.c				\
 	ephy-dnd.c				\
@@ -73,25 +76,12 @@ libephymisc_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libephymisc_la_CFLAGS = \
-        $(EPIPHANY_DEPENDENCY_CFLAGS)	\
+        $(DEPENDENCIES_CFLAGS)	\
+        $(DBUS_CFLAGS)		\
 	$(AM_CFLAGS)
 
-libephymisc_la_LIBADD =
-
-if ENABLE_DBUS
-INST_H_FILES += \
-	ephy-dbus.h
-
-TYPES_H_FILES += \
-	ephy-dbus.h
-
-libephymisc_la_SOURCES += \
-	ephy-dbus.c
-
-libephymisc_la_CFLAGS += $(DBUS_CFLAGS)
-
-libephymisc_la_LIBADD += $(DBUS_LIBS)
-endif
+libephymisc_la_LIBADD = \
+	$(DBUS_LIBS)
 
 BUILT_SOURCES = \
 	ephy-lib-type-builtins.c	\
diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am
index b95bd1bf4..b87aae55e 100644
--- a/lib/egg/Makefile.am
+++ b/lib/egg/Makefile.am
@@ -34,7 +34,7 @@ libegg_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libegg_la_CFLAGS = \
-	$(EPIPHANY_DEPENDENCY_CFLAGS)		\
+	$(DEPENDENCIES_CFLAGS)		\
 	$(AM_CFLAGS)
 
 BUILT_SOURCES = \
diff --git a/lib/ephy-dbus.c b/lib/ephy-dbus.c
index 9ac7354ca..630767273 100644
--- a/lib/ephy-dbus.c
+++ b/lib/ephy-dbus.c
@@ -113,11 +113,7 @@ session_filter_func (DBusConnection *connection,
 	EphyDbus *dbus = EPHY_DBUS (user_data);
 
 	if (dbus_message_is_signal (message,
-#ifdef HAVE_NEW_DBUS
 				    DBUS_INTERFACE_LOCAL,
-#else
-				    DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
-#endif
 				    "Disconnected"))
 	{
 		LOG ("EphyDbus disconnected from session bus");
@@ -147,11 +143,7 @@ system_filter_func (DBusConnection *connection,
 	LOG ("EphyDbus filtering message from system bus");
 
 	if (dbus_message_is_signal (message,
-#ifdef HAVE_NEW_DBUS
 				    DBUS_INTERFACE_LOCAL,
-#else
-				    DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
-#endif
 				    "Disconnected"))
 	{
 		LOG ("EphyDbus disconnected from system bus");
@@ -225,11 +217,7 @@ ephy_dbus_connect_to_session_bus (EphyDbus *dbus)
 
 	dbus_connection_add_filter (bus, session_filter_func, dbus, NULL);
 
-#ifdef HAVE_NEW_DBUS
 	dbus_bus_request_name (bus, epiphany_dbus_service, 0, NULL);
-#else
-	dbus_bus_acquire_service (bus, epiphany_dbus_service, 0, &error);
-#endif
 
 	if (dbus_error_is_set (&error)) {
 		g_warning ("EphyDbus failed to acquire epiphany service");
@@ -250,11 +238,7 @@ static void
 ephy_dbus_disconnect_bus (DBusConnection *bus)
 {
 	if (bus != NULL) {
-#ifdef HAVE_NEW_DBUS
 		dbus_connection_close (bus);
-#else
-		dbus_connection_disconnect (bus);
-#endif
 		dbus_connection_unref (bus);
 	}
 }
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index adb819b50..ef4ee116a 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -28,5 +28,5 @@ libephywidgets_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 libephywidgets_la_CFLAGS = \
-	$(EPIPHANY_DEPENDENCY_CFLAGS)	\
+	$(DEPENDENCIES_CFLAGS)	\
 	$(AM_CFLAGS)