about summary refs log tree commit diff
path: root/src/nm-bus-manager.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-10-01 00:34:40 +0200
committerMichael Biebl <biebl@debian.org>2016-10-01 00:34:40 +0200
commit636b831a0f663aa53b0e186d5dc44a623150d376 (patch)
tree48ef86c0ff45c7c2c7fcddf910a9102d768c957c /src/nm-bus-manager.c
parentc8a2b286220c6b2bbde384d0d7dd2629b66e312c (diff)
parent270c4830551c9810ad4e83f9a1db2b1cb946208c (diff)
Merge tag 'upstream/1.4.2'
Upstream version 1.4.2
Diffstat (limited to 'src/nm-bus-manager.c')
-rw-r--r--src/nm-bus-manager.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nm-bus-manager.c b/src/nm-bus-manager.c
index 449de4e6..270792ef 100644
--- a/src/nm-bus-manager.c
+++ b/src/nm-bus-manager.c
@@ -221,7 +221,11 @@ private_server_new_connection (GDBusServer *server,
 
 	_LOGD ("(%s) accepted connection %p on private socket", s->tag, conn);
 
-	/* Emit this for the manager */
+	/* Emit this for the manager.
+	 *
+	 * It is essential to do this from the "new-connection" signal handler, as
+	 * at that point no messages from the connection are yet processed
+	 * (which avoids races with registering objects). */
 	g_signal_emit (s->manager,
 	               signals[PRIVATE_CONNECTION_NEW],
 	               s->detail,