aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-François Rameau <jframeau@cvs.gnome.org>2005-02-04 07:15:32 +0800
committerJean-François Rameau <jframeau@src.gnome.org>2005-02-04 07:15:32 +0800
commit1df4c1cb2333e352044f00e18f27bb83a8e1f67a (patch)
tree742cc04d8648e8cf0d4f0d9482fae8e295df3fd1
parentdf91f5ce52550537d113d771f46a8c77bf739de4 (diff)
downloadgsoc2013-epiphany-1df4c1cb2333e352044f00e18f27bb83a8e1f67a.tar
gsoc2013-epiphany-1df4c1cb2333e352044f00e18f27bb83a8e1f67a.tar.gz
gsoc2013-epiphany-1df4c1cb2333e352044f00e18f27bb83a8e1f67a.tar.bz2
gsoc2013-epiphany-1df4c1cb2333e352044f00e18f27bb83a8e1f67a.tar.lz
gsoc2013-epiphany-1df4c1cb2333e352044f00e18f27bb83a8e1f67a.tar.xz
gsoc2013-epiphany-1df4c1cb2333e352044f00e18f27bb83a8e1f67a.tar.zst
gsoc2013-epiphany-1df4c1cb2333e352044f00e18f27bb83a8e1f67a.zip
We don't want Epiphany to exit when DBUS restarts.
2005-02-04 Jean-François Rameau <jframeau@cvs.gnome.org> * lib/ephy-dbus.c: (ephy_dbus_connect_to_system_bus, ephy_dbus_connect_to_session_bus): We don't want Epiphany to exit when DBUS restarts. * lib/ephy-dbus.c: (ephy_dbus_connect_to_system_bus_cb): Bug: bad test.
-rw-r--r--ChangeLog11
-rw-r--r--lib/ephy-dbus.c4
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7daa76daf..0c368541b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-02-04 Jean-François Rameau <jframeau@cvs.gnome.org>
+
+ * lib/ephy-dbus.c: (ephy_dbus_connect_to_system_bus,
+ ephy_dbus_connect_to_session_bus):
+
+ We don't want Epiphany to exit when DBUS restarts.
+
+ * lib/ephy-dbus.c: (ephy_dbus_connect_to_system_bus_cb):
+
+ Bug: bad test.
+
2005-02-02 Christian Persch <chpe@cvs.gnome.org>
* data/epiphany-lockdown.schemas.in:
diff --git a/lib/ephy-dbus.c b/lib/ephy-dbus.c
index 835bf1e36..349202ea8 100644
--- a/lib/ephy-dbus.c
+++ b/lib/ephy-dbus.c
@@ -102,7 +102,7 @@ ephy_dbus_connect_to_system_bus_cb (gpointer user_data)
ephy_dbus_connect_to_system_bus (dbus);
- return dbus->priv->system_bus != NULL;
+ return dbus->priv->system_bus == NULL;
}
static DBusHandlerResult
@@ -177,6 +177,7 @@ ephy_dbus_connect_to_system_bus (EphyDbus *dbus)
dbus_error_free (&error);
return;
}
+ dbus_connection_set_exit_on_disconnect (bus, FALSE);
dbus_connection_setup_with_g_main (bus, NULL);
dbus_connection_add_filter (bus, system_filter_func, dbus, NULL);
@@ -226,6 +227,7 @@ ephy_dbus_connect_to_session_bus (EphyDbus *dbus)
dbus_bus_acquire_service (bus, epiphany_dbus_service, 0, NULL);
+ dbus_connection_set_exit_on_disconnect (bus, FALSE);
dbus_connection_setup_with_g_main (bus, NULL);
dbus->priv->session_bus = bus;