Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Improve setting of options
[src/app-framework-binder.git]
/
src
/
afb-api-dbus.c
diff --git
a/src/afb-api-dbus.c
b/src/afb-api-dbus.c
index
f413294
..
562465e
100644
(file)
--- a/
src/afb-api-dbus.c
+++ b/
src/afb-api-dbus.c
@@
-15,7
+15,7
@@
* limitations under the License.
*/
* limitations under the License.
*/
-#if
defined(WITH_DBUS_TRANSPARENCY)
+#if
WITH_DBUS_TRANSPARENCY
#define _GNU_SOURCE
#define _GNU_SOURCE
@@
-33,8
+33,6
@@
#include <afb/afb-event-x2.h>
#include <afb/afb-event-x2.h>
-#include "afb-systemd.h"
-
#include "afb-session.h"
#include "afb-msg-json.h"
#include "afb-api.h"
#include "afb-session.h"
#include "afb-msg-json.h"
#include "afb-api.h"
@@
-44,8
+42,10
@@
#include "afb-cred.h"
#include "afb-evt.h"
#include "afb-xreq.h"
#include "afb-cred.h"
#include "afb-evt.h"
#include "afb-xreq.h"
-#include "verbose.h"
+#include "verbose.h"
+#include "systemd.h"
+#include "jobs.h"
static const char DEFAULT_PATH_PREFIX[] = "/org/agl/afb/api/";
static const char DEFAULT_PATH_PREFIX[] = "/org/agl/afb/api/";
@@
-130,7
+130,8
@@
static struct api_dbus *make_api_dbus_3(int system, const char *path, size_t pat
}
/* choose the bus */
}
/* choose the bus */
- sdbus = (system ? afb_systemd_get_system_bus : afb_systemd_get_user_bus)();
+ jobs_acquire_event_manager();
+ sdbus = (system ? systemd_get_system_bus : systemd_get_user_bus)();
if (sdbus == NULL)
goto error2;
if (sdbus == NULL)
goto error2;