From: José Bollo <jose.bollo@iot.bzh>
Date: Thu, 16 Mar 2017 08:21:40 +0000 (+0100)
Subject: Use the same dbus connection
X-Git-Tag: x-first-with-systemd~4
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-main.git;a=commitdiff_plain;h=a1ae7c362b0b7a65cad813a8def6c8eae72f33b2

Use the same dbus connection

Opening one connection per part of the
program doesn't make sense and waste resources.
Using a common one is much better.

Change-Id: I74dc3cd7ae41d7bfa2f03f4a252495e8f5f81578
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---

diff --git a/src/afm-user-daemon.c b/src/afm-user-daemon.c
index f9d74e9..a180be6 100644
--- a/src/afm-user-daemon.c
+++ b/src/afm-user-daemon.c
@@ -451,7 +451,7 @@ static int open_bus(sd_bus **ret, int isuser, const char *address)
 	int rc;
 
 	if (address == NULL)
-		return (isuser ? sd_bus_open_user : sd_bus_open_system)(ret);
+		return (isuser ? sd_bus_default_user : sd_bus_default_system)(ret);
 
 	rc = sd_bus_new(&b);
 	if (rc < 0)
diff --git a/src/utils-systemd.c b/src/utils-systemd.c
index 48fb3d8..62930ed 100644
--- a/src/utils-systemd.c
+++ b/src/utils-systemd.c
@@ -51,11 +51,11 @@ static int get_bus(int isuser, struct sd_bus **ret)
 		*ret = bus;
 		rc = 0;
 	} else if (isuser) {
-		rc = sd_bus_open_user(ret);
+		rc = sd_bus_default_user(ret);
 		if (!rc)
 			usrbus = *ret;
 	} else {
-		rc = sd_bus_open_system(ret);
+		rc = sd_bus_default_system(ret);
 		if (!rc)
 			sysbus = *ret;
 	}