chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c6c18be
)
dbus: suppress duplicate message when reusing bus for system and session
author
Lennart Poettering
<lennart@poettering.net>
Sat, 10 Jul 2010 22:51:28 +0000
(
00:51
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Sat, 10 Jul 2010 22:51:28 +0000
(
00:51
+0200)
src/dbus.c
patch
|
blob
|
history
diff --git
a/src/dbus.c
b/src/dbus.c
index 7f8b6a05d5481ccad43184b8212e08cf476a16a5..0b93db55deda86d54b93815f8ed7ccd90c35d821 100644
(file)
--- a/
src/dbus.c
+++ b/
src/dbus.c
@@
-758,7
+758,6
@@
static void bus_new_connection(
static int bus_init_system(Manager *m) {
DBusError error;
static int bus_init_system(Manager *m) {
DBusError error;
- char *id;
int r;
assert(m);
int r;
assert(m);
@@
-800,10
+799,13
@@
static int bus_init_system(Manager *m) {
goto fail;
}
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;
return 0;
@@
-816,7
+818,6
@@
fail:
static int bus_init_api(Manager *m) {
DBusError error;
static int bus_init_api(Manager *m) {
DBusError error;
- char *id;
int r;
assert(m);
int r;
assert(m);
@@
-884,10
+885,13
@@
static int bus_init_api(Manager *m) {
if ((r = query_name_list(m)) < 0)
goto fail;
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;
return 0;