fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-06 11:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dbus-1.10'

Browse source
This commit is contained in:
Simon McVittie 2016-08-12 10:14:46 +01:00
commit 53ddb81c8c
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
NEWS
View file

@ -57,6 +57,12 @@ Fixes:
• Be explicit about enum comparison when loading XML
(fd.o #93205, Deepika Aggarwal)
• update-activation-environment: produce better diagnostics on error
(fd.o #96653, Simon McVittie)
• Avoid various compiler warnings with gcc 6
(fd.o #97282; Thomas Zimmermann, Simon McVittie)
D-Bus 1.11.2 (2016-03-07)
==

6
tools/dbus-update-activation-environment.c
View file

@ -378,7 +378,8 @@ next:
exit (EX_UNAVAILABLE);
}
if (!dbus_message_get_args (msg, &error, DBUS_TYPE_INVALID))
if (dbus_set_error_from_message (&error, msg) ||
!dbus_message_get_args (msg, &error, DBUS_TYPE_INVALID))
{
fprintf (stderr,
"%s: error from dbus-daemon: %s: %s\n",
@ -402,7 +403,8 @@ next:
"%s: warning: error sending to systemd: %s: %s\n",
PROGNAME, error.name, error.message);
}
else if (!dbus_message_get_args (msg, &error, DBUS_TYPE_INVALID))
else if (dbus_set_error_from_message (&error, msg) ||
!dbus_message_get_args (msg, &error, DBUS_TYPE_INVALID))
{
fprintf (stderr,
"%s: warning: error from systemd: %s: %s\n",