diff options
| author | Colin Walters <walters@verbum.org> | 2013-03-18 14:38:24 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-03-18 19:59:32 -0400 |
| commit | c6a818c82035da91e7987920510f0dda61d8781a (patch) | |
| tree | aca8572ad6fdd72b93b47b8b3ee6ca584a948efa /src/core | |
| parent | 8cb17a6dc88cecfcee3189765031e9e8a1f4106b (diff) | |
Use bus_maybe_send_reply() where applicable
This is a followup to: commit 1a37b9b9043ef83e9900e460a9a1fccced3acf89
It will fix denial messages from dbus-daemon between gdm and
systemd-logind on logging into GNOME due to this.
See the previous commit for more details.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/dbus-job.c | 4 | ||||
| -rw-r--r-- | src/core/dbus-manager.c | 2 | ||||
| -rw-r--r-- | src/core/dbus-snapshot.c | 2 | ||||
| -rw-r--r-- | src/core/dbus-unit.c | 6 | ||||
| -rw-r--r-- | src/core/dbus.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c index 20c2a62338..096542be39 100644 --- a/src/core/dbus-job.c +++ b/src/core/dbus-job.c @@ -116,7 +116,7 @@ static DBusHandlerResult bus_job_message_dispatch(Job *j, DBusConnection *connec return bus_default_message_handler(connection, message, INTROSPECTION, INTERFACES_LIST, bps); } - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_HANDLED; @@ -185,7 +185,7 @@ static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBu free(introspection); - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; return DBUS_HANDLER_RESULT_HANDLED; diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 8f4bbc59b7..75a341fce1 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -1894,7 +1894,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, } if (reply) - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; return DBUS_HANDLER_RESULT_HANDLED; diff --git a/src/core/dbus-snapshot.c b/src/core/dbus-snapshot.c index 02cfcb1829..2ae8574f59 100644 --- a/src/core/dbus-snapshot.c +++ b/src/core/dbus-snapshot.c @@ -77,7 +77,7 @@ DBusHandlerResult bus_snapshot_message_handler(Unit *u, DBusConnection *c, DBusM return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps); } - if (!dbus_connection_send(c, reply, NULL)) + if (!bus_maybe_send_reply(c, message, reply)) return DBUS_HANDLER_RESULT_NEED_MEMORY; return DBUS_HANDLER_RESULT_HANDLED; diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index 7c23e1e616..dc7d1f13f0 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -582,7 +582,7 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusConnection *conn } if (reply) - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; return DBUS_HANDLER_RESULT_HANDLED; @@ -673,7 +673,7 @@ static DBusHandlerResult bus_unit_message_handler(DBusConnection *connection, DB free(introspection); - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; return DBUS_HANDLER_RESULT_HANDLED; @@ -886,7 +886,7 @@ DBusHandlerResult bus_unit_queue_job( DBUS_TYPE_INVALID)) goto oom; - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; return DBUS_HANDLER_RESULT_HANDLED; diff --git a/src/core/dbus.c b/src/core/dbus.c index 08aff1fd2b..236ebc99d9 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -406,7 +406,7 @@ static DBusHandlerResult api_bus_message_filter(DBusConnection *connection, DBus dbus_error_free(&error); if (reply) { - if (!dbus_connection_send(connection, reply, NULL)) + if (!bus_maybe_send_reply(connection, message, reply)) goto oom; dbus_message_unref(reply); |