picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dbus: suppress duplicate message when reusing bus for system and session

This commit is contained in:
Lennart Poettering 2010-07-11 00:51:28 +02:00
parent c6c18be35b
commit 9014a8bd7a
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dbus.c
View File

@ -758,7 +758,6 @@ static void bus_new_connection(
static int bus_init_system(Manager *m) {
DBusError error;
char *id;
int r;
assert(m);
@ -800,10 +799,13 @@ static int bus_init_system(Manager *m) {
goto fail;
}
log_info("Successfully connected to system D-Bus bus %s as %s",
strnull((id = dbus_connection_get_server_id(m->system_bus))),
strnull(dbus_bus_get_unique_name(m->system_bus)));
dbus_free(id);
if (m->api_bus != m->system_bus) {
char *id;
log_info("Successfully connected to system D-Bus bus %s as %s",
strnull((id = dbus_connection_get_server_id(m->system_bus))),
strnull(dbus_bus_get_unique_name(m->system_bus)));
dbus_free(id);
}
return 0;
@ -816,7 +818,6 @@ fail:
static int bus_init_api(Manager *m) {
DBusError error;
char *id;
int r;
assert(m);
@ -884,10 +885,13 @@ static int bus_init_api(Manager *m) {
if ((r = query_name_list(m)) < 0)
goto fail;
log_info("Successfully connected to API D-Bus bus %s as %s",
strnull((id = dbus_connection_get_server_id(m->api_bus))),
strnull(dbus_bus_get_unique_name(m->api_bus)));
dbus_free(id);
if (m->api_bus != m->system_bus) {
char *id;
log_info("Successfully connected to API D-Bus bus %s as %s",
strnull((id = dbus_connection_get_server_id(m->api_bus))),
strnull(dbus_bus_get_unique_name(m->api_bus)));
dbus_free(id);
}
return 0;