aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWouter Bolsterlee <wbolster@gnome.org>2006-10-18 17:08:04 +0800
committerWouter Bolsterlee <wbolster@src.gnome.org>2006-10-18 17:08:04 +0800
commit74dff8bafa05f5ccb02b201194ae822cf4a320ff (patch)
treee2a8b548668c41f79e4c3f1d4c7606b08da64d4d
parent2fbe5bad6a17d859253b37ac3af78cb957cc8058 (diff)
downloadgsoc2013-epiphany-74dff8bafa05f5ccb02b201194ae822cf4a320ff.tar
gsoc2013-epiphany-74dff8bafa05f5ccb02b201194ae822cf4a320ff.tar.gz
gsoc2013-epiphany-74dff8bafa05f5ccb02b201194ae822cf4a320ff.tar.bz2
gsoc2013-epiphany-74dff8bafa05f5ccb02b201194ae822cf4a320ff.tar.lz
gsoc2013-epiphany-74dff8bafa05f5ccb02b201194ae822cf4a320ff.tar.xz
gsoc2013-epiphany-74dff8bafa05f5ccb02b201194ae822cf4a320ff.tar.zst
gsoc2013-epiphany-74dff8bafa05f5ccb02b201194ae822cf4a320ff.zip
Don't try to close shared dbus connections. This avoids dbus warnings on
2006-10-18 Wouter Bolsterlee <wbolster@gnome.org> * src/ephy-dbus.c: (ephy_dbus_shutdown): Don't try to close shared dbus connections. This avoids dbus warnings on quit. Fixes bug #358007.
-rw-r--r--ChangeLog6
-rw-r--r--src/ephy-dbus.c14
2 files changed, 8 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index b2d5221d8..2481d2707 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2006-10-18 Wouter Bolsterlee <wbolster@gnome.org>
+ * src/ephy-dbus.c: (ephy_dbus_shutdown):
+ Don't try to close shared dbus connections. This avoids
+ dbus warnings on quit. Fixes bug #358007.
+
+2006-10-18 Wouter Bolsterlee <wbolster@gnome.org>
+
* src/popup-commands.c: (background_download_completed):
Remove unused type variable.
diff --git a/src/ephy-dbus.c b/src/ephy-dbus.c
index 9b830a3e2..eb68dd049 100644
--- a/src/ephy-dbus.c
+++ b/src/ephy-dbus.c
@@ -301,16 +301,6 @@ ephy_dbus_connect_to_session_bus (EphyDbus *ephy_dbus,
return TRUE;
}
-static void
-ephy_dbus_disconnect_bus (DBusGConnection *bus)
-{
- if (bus != NULL) {
- dbus_connection_close
- (dbus_g_connection_get_connection (bus));
- dbus_g_connection_unref (bus);
- }
-}
-
/* Public methods */
static void
@@ -337,7 +327,7 @@ ephy_dbus_shutdown (EphyDbus *dbus)
dbus_connection_remove_filter
(dbus_g_connection_get_connection (priv->session_bus),
session_filter_func, dbus);
- ephy_dbus_disconnect_bus (priv->session_bus);
+ dbus_g_connection_unref (priv->session_bus);
priv->session_bus = NULL;
}
@@ -346,7 +336,7 @@ ephy_dbus_shutdown (EphyDbus *dbus)
dbus_connection_remove_filter
(dbus_g_connection_get_connection (priv->system_bus),
system_filter_func, dbus);
- ephy_dbus_disconnect_bus (priv->system_bus);
+ dbus_g_connection_unref (priv->system_bus);
priv->system_bus = NULL;
}
}