]> git.pld-linux.org Git - packages/PackageKit.git/blame - consolekit-fallback.patch
fix build without apidocs and static_libs
[packages/PackageKit.git] / consolekit-fallback.patch
CommitLineData
783c79a3
AM
1--- PackageKit-1.1.13/src/pk-dbus.c.orig 2018-12-14 10:05:15.000000000 +0100
2+++ PackageKit-1.1.13/src/pk-dbus.c 2020-03-03 11:41:02.148537933 +0100
bcd7526e
JR
3@@ -28,6 +28,7 @@
4 #include <gio/gio.h>
5
783c79a3 6 #ifdef HAVE_SYSTEMD_SD_LOGIN_H
bcd7526e
JR
7+ #include <systemd/sd-daemon.h>
8 #include <systemd/sd-login.h>
9 #endif
10
783c79a3 11@@ -218,9 +219,7 @@ gchar *
bcd7526e
JR
12 pk_dbus_get_session (PkDbus *dbus, const gchar *sender)
13 {
14 gchar *session = NULL;
783c79a3
AM
15-#ifndef HAVE_SYSTEMD_SD_LOGIN_H
16 g_autoptr(GError) error = NULL;
bcd7526e
JR
17-#endif
18 guint pid;
783c79a3 19 g_autoptr(GVariant) value = NULL;
bcd7526e 20
783c79a3 21@@ -249,10 +248,12 @@ pk_dbus_get_session (PkDbus *dbus, const
bcd7526e
JR
22
23 /* get session from systemd or ConsoleKit */
783c79a3
AM
24 #ifdef HAVE_SYSTEMD_SD_LOGIN_H
25+ if (sd_booted () > 0) {
bcd7526e 26 session = pk_dbus_get_session_systemd (pid);
783c79a3
AM
27 if (session == NULL)
28 g_warning ("failed to get session for pid %u", pid);
bcd7526e
JR
29-#else
30+ } else {
31+#endif
32 /* get session from ConsoleKit */
33 value = g_dbus_proxy_call_sync (dbus->priv->proxy_session,
34 "GetSessionForUnixProcess",
783c79a3 35@@ -268,6 +269,8 @@ pk_dbus_get_session (PkDbus *dbus, const
bcd7526e
JR
36 goto out;
37 }
38 g_variant_get (value, "(o)", &session);
783c79a3 39+#ifdef HAVE_SYSTEMD_SD_LOGIN_H
bcd7526e
JR
40+ }
41 #endif
42 out:
43 return session;
This page took 0.081467 seconds and 4 git commands to generate.