aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/ephy-dbus.c5
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 93e086129..bb3070289 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-03 Jean-François Rameau <jframeau@cvs.gnome.org>
+
+ * src/ephy-dbus.c: (ephy_dbus_connect_to_session_bus):
+
+ Fix compilation with DBUS 0.6 (DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT constant removed).
+
2006-01-02 Christian Persch <chpe@cvs.gnome.org>
* Makefile.am:
diff --git a/src/ephy-dbus.c b/src/ephy-dbus.c
index 2d3734137..1cbed58da 100644
--- a/src/ephy-dbus.c
+++ b/src/ephy-dbus.c
@@ -236,6 +236,11 @@ ephy_dbus_connect_to_session_bus (EphyDbus *ephy_dbus)
DBUS_PATH_DBUS,
DBUS_INTERFACE_DBUS);
+/* dbus 0.6 dependency */
+#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
+#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT 0
+#endif
+
org_freedesktop_DBus_request_name (proxy,
DBUS_EPHY_SERVICE,
DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT,