diff options
| author | Victor Toso <victortoso@redhat.com> | 2016-05-03 11:17:20 +0200 |
|---|---|---|
| committer | Victor Toso <victortoso@redhat.com> | 2016-05-04 09:23:20 +0200 |
| commit | 691893864f14fbf75f8684359f13c2c5c4a93c07 (patch) | |
| tree | b5f980161a48f560fee37e8bd97f6236c41202af | |
| parent | b5f0352e9e5ea91eff0880674cbc5080e78c9e5b (diff) | |
console-kit: Ignore unrequested messages from dbus
Instead of treating them as errors.
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
| -rw-r--r-- | src/console-kit.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/console-kit.c b/src/console-kit.c index d4eecd7..c7e60df 100644 --- a/src/console-kit.c +++ b/src/console-kit.c @@ -109,12 +109,6 @@ si_dbus_read_signals(struct session_info *info) while (message != NULL) { const char *member; - if (dbus_message_get_type(message) != DBUS_MESSAGE_TYPE_SIGNAL) { - syslog(LOG_WARNING, "(console-kit) received non signal message"); - dbus_message_unref(message); - break; - } - member = dbus_message_get_member (message); if (g_strcmp0(member, SEAT_SIGNAL_ACTIVE_SESSION_CHANGED) == 0) { DBusMessageIter iter; @@ -142,8 +136,12 @@ si_dbus_read_signals(struct session_info *info) "ActiveSessionChanged message has unexpected type: '%c'", type); } - } else if (info->verbose) { - syslog(LOG_DEBUG, "(console-kit) Signal not handled: %s", member); + } else { + if (dbus_message_get_type(message) != DBUS_MESSAGE_TYPE_SIGNAL) { + syslog(LOG_WARNING, "(console-kit) received non signal message"); + } else if (info->verbose) { + syslog(LOG_DEBUG, "(console-kit) Signal not handled: %s", member); + } } dbus_message_unref(message); |