job: Use the context's event loop

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/pakfire/daemon.c b/src/pakfire/daemon.c
index 64e3e9e573f111dd8571e8539cd55abdb3cf16ad..1a76442dc74ea966ce734a82c610f93f81646301 100644 (file)
--- a/src/pakfire/daemon.c
+++ b/src/pakfire/daemon.c
@@ -911,10 +911,6 @@ struct pakfire_daemon* pakfire_daemon_unref(struct pakfire_daemon* daemon) {
        return NULL;
 }
 
-sd_event* pakfire_daemon_loop(struct pakfire_daemon* daemon) {
-       return sd_event_ref(daemon->loop);
-}
-
 struct pakfire_client* pakfire_daemon_client(struct pakfire_daemon* daemon) {
        return pakfire_client_ref(daemon->client);
 }

diff --git a/src/pakfire/daemon.h b/src/pakfire/daemon.h
index 089cd444497cebc448c4b4c93c038225ce63f95a..0b2a4d59864dbfe6e1101cf8b84381ea4cca0ea9 100644 (file)
--- a/src/pakfire/daemon.h
+++ b/src/pakfire/daemon.h
@@ -34,7 +34,6 @@ int pakfire_daemon_create(struct pakfire_daemon** daemon, struct pakfire_ctx* ct
 struct pakfire_daemon* pakfire_daemon_ref(struct pakfire_daemon* daemon);
 struct pakfire_daemon* pakfire_daemon_unref(struct pakfire_daemon* daemon);
 
-sd_event* pakfire_daemon_loop(struct pakfire_daemon* daemon);
 struct pakfire_client* pakfire_daemon_client(struct pakfire_daemon* daemon);
 
 const char* pakfire_daemon_url(struct pakfire_daemon* daemon);

diff --git a/src/pakfire/job.c b/src/pakfire/job.c
index f1a480d2043924a27747e9db7b25a07dfa19d395..dbcb7c51a7bcfc2df3d5fde3875a264f53aa8c29 100644 (file)
--- a/src/pakfire/job.c
+++ b/src/pakfire/job.c
@@ -897,10 +897,9 @@ int pakfire_job_create(struct pakfire_job** job, struct pakfire_ctx* ctx,
        j->daemon = pakfire_daemon_ref(daemon);
 
        // Fetch a reference to the event loop
-       j->loop = pakfire_daemon_loop(daemon);
-       if (!j->loop) {
-               ERROR(j->ctx, "Could not fetch the event loop: %m\n");
-               r = -errno;
+       r = pakfire_ctx_loop(j->ctx, &j->loop);
+       if (r < 0) {
+               ERROR(j->ctx, "Could not fetch the event loop: %s\n", strerror(-r));
                goto ERROR;
        }