diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-03-27 17:42:07 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-03-27 17:42:07 +0300 |
| commit | 0c9ed253893faa13313fee30ce6dbf40a0339035 (patch) | |
| tree | 488b25b9c65c93011c75eb09035db2d5ee2f400f /bus/activation.h | |
| parent | 6a2ee6bd4acd68ec4f28fa397543079d8cab77cc (diff) | |
| parent | c1c801dcb5e6470e9327195c89ee2da6e505127b (diff) | |
| download | dbus-0c9ed253893faa13313fee30ce6dbf40a0339035.tar.gz | |
Merge branch 'master' of git://anonscm.debian.org/pkg-utopia/dbus
Conflicts:
debian/changelog
debian/dbus.postinst
Diffstat (limited to 'bus/activation.h')
| -rw-r--r-- | bus/activation.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/bus/activation.h b/bus/activation.h index 97f25b1f..fc5d426f 100644 --- a/bus/activation.h +++ b/bus/activation.h @@ -62,8 +62,7 @@ dbus_bool_t dbus_activation_systemd_failure (BusActivation *activation, dbus_bool_t bus_activation_send_pending_auto_activation_messages (BusActivation *activation, BusService *service, - BusTransaction *transaction, - DBusError *error); + BusTransaction *transaction); #endif /* BUS_ACTIVATION_H */ |