summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Hallendal <hallski@src.gnome.org>2004-09-20 09:24:12 +0000
committerMikael Hallendal <hallski@src.gnome.org>2004-09-20 09:24:12 +0000
commitc14076a19ca7fae43bb12bca4195410a49c8db1f (patch)
tree1a74429b53e4947f4c0f37232fe5dce481b20608
parentf1be67e824f3d31fba4ec85c992670f808b50a47 (diff)
downloadgconf-c14076a19ca7fae43bb12bca4195410a49c8db1f.tar.gz
check d-bus connectino before trying to use itGCONF_DBUS_2_6_4
-rw-r--r--gconf/gconf-dbus.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
index 3c68da6f..ad00bb21 100644
--- a/gconf/gconf-dbus.c
+++ b/gconf/gconf-dbus.c
@@ -384,11 +384,11 @@ ensure_dbus_connection (void)
global_conn = dbus_bus_get (DBUS_BUS_SESSION, NULL);
#endif
- dbus_connection_setup_with_g_main (global_conn, NULL);
-
if (global_conn == NULL)
return FALSE;
+ dbus_connection_setup_with_g_main (global_conn, NULL);
+
dbus_bus_add_match (global_conn, BUS_RULE, NULL);
dbus_bus_add_match (global_conn, NOTIFY_RULE, NULL);