aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ephy-dbus.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-08-29 01:24:18 +0800
committerChristian Persch <chpe@src.gnome.org>2005-08-29 01:24:18 +0800
commit29a5720ddb756ba1d0e88c7b4e187ff7a180c034 (patch)
tree3049aaba89b24a23a99c3d46db0c05dba9b31b15 /lib/ephy-dbus.c
parentdde82959e8394ec14aa7431b3b6695e9ed9565f2 (diff)
downloadgsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.tar
gsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.tar.gz
gsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.tar.bz2
gsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.tar.lz
gsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.tar.xz
gsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.tar.zst
gsoc2013-epiphany-29a5720ddb756ba1d0e88c7b4e187ff7a180c034.zip
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.
Diffstat (limited to 'lib/ephy-dbus.c')
-rw-r--r--lib/ephy-dbus.c16
1 files changed, 0 insertions, 16 deletions
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);
}
}