Created
October 9, 2018 22:47
-
-
Save jorgicio/dcc3f2f42f15b7426b9497ab68262a0f to your computer and use it in GitHub Desktop.
mate-patches/mate-session-manager/mate-session-manager-1.20-enable-elogind.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -Naur mate-session-manager-1.20.1/configure.ac mate-session-manager-elogind-1.20.1/configure.ac | |
--- mate-session-manager-1.20.1/configure.ac 2018-06-17 10:54:45.000000000 -0400 | |
+++ mate-session-manager-elogind-1.20.1/configure.ac 2018-10-09 17:27:11.624380596 -0300 | |
@@ -110,6 +110,26 @@ | |
AC_SUBST(HAVE_SYSTEMD) | |
dnl ==================================================================== | |
+dnl Check for libelogind | |
+dnl ==================================================================== | |
+ | |
+AC_ARG_ENABLE([libelogind], [AS_HELP_STRING([--enable-libsystemd-login],[Use libelogind instead of libsystemd-login])]) | |
+use_libelogind=no | |
+LIBELOGIND_REQUIRED=218 | |
+ | |
+if test "x$enable_libelogind" != "xno"; then | |
+ PKG_CHECK_EXISTS([libelogind], [use_libelogind=yes], | |
+ [PKG_CHECK_EXISTS([libelogind >= $LIBELOGIND_REQUIRED], [use_libelogind=yes])]) | |
+ if test "x$use_libelogind" = "xyes"; then | |
+ PKG_CHECK_MODULES([LIBELOGIND],[libelogind],, | |
+ [PKG_CHECK_MODULES([LIBELOGIND],[libelogind >= $LIBELOGIND_REQUIRED])]) | |
+ AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available]) | |
+ fi | |
+fi | |
+ | |
+AM_CONDITIONAL(USE_LIBELOGIND, [test "$use_libelogind" = "yes"]) | |
+ | |
+dnl ==================================================================== | |
dnl Check for XSync extension | |
dnl ==================================================================== | |
@@ -335,6 +355,7 @@ | |
Default WM: ${with_default_wm} | |
Systemd support: ${use_systemd} | |
+ elogind support: ${use_libelogind} | |
IPv6 support: ${have_full_ipv6} | |
Backtrace support: ${have_backtrace} | |
XRender support: ${have_xrender} | |
diff -Naur mate-session-manager-1.20.1/mate-session/gsm-logout-dialog.c mate-session-manager-elogind-1.20.1/mate-session/gsm-logout-dialog.c | |
--- mate-session-manager-1.20.1/mate-session/gsm-logout-dialog.c 2018-06-17 10:45:56.000000000 -0400 | |
+++ mate-session-manager-elogind-1.20.1/mate-session/gsm-logout-dialog.c 2018-10-09 18:48:33.120974743 -0300 | |
@@ -28,7 +28,7 @@ | |
#include <gtk/gtk.h> | |
#include "gsm-logout-dialog.h" | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
#include "gsm-systemd.h" | |
#endif | |
#include "gsm-consolekit.h" | |
@@ -54,7 +54,7 @@ | |
struct _GsmLogoutDialogPrivate | |
{ | |
GsmDialogLogoutType type; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
GsmSystemd *systemd; | |
#endif | |
GsmConsolekit *consolekit; | |
@@ -153,7 +153,7 @@ | |
gtk_window_set_skip_taskbar_hint (GTK_WINDOW (logout_dialog), TRUE); | |
gtk_window_set_keep_above (GTK_WINDOW (logout_dialog), TRUE); | |
gtk_window_stick (GTK_WINDOW (logout_dialog)); | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) | |
logout_dialog->priv->systemd = gsm_get_systemd (); | |
else | |
@@ -179,7 +179,7 @@ | |
g_source_remove (logout_dialog->priv->timeout_id); | |
logout_dialog->priv->timeout_id = 0; | |
} | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (logout_dialog->priv->systemd) { | |
g_object_unref (logout_dialog->priv->systemd); | |
logout_dialog->priv->systemd = NULL; | |
@@ -199,7 +199,7 @@ | |
{ | |
gboolean ret; | |
ret = FALSE; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) | |
ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd); | |
else | |
@@ -213,7 +213,7 @@ | |
{ | |
gboolean ret; | |
ret = FALSE; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) | |
ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd); | |
else | |
@@ -235,7 +235,7 @@ | |
g_object_unref (settings); | |
if (!locked) { | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) | |
ret = gsm_systemd_can_switch_user (logout_dialog->priv->systemd); | |
else | |
@@ -251,7 +251,7 @@ | |
{ | |
gboolean ret; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) | |
ret = gsm_systemd_can_restart (logout_dialog->priv->systemd); | |
else | |
@@ -269,7 +269,7 @@ | |
{ | |
gboolean ret; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) | |
ret = gsm_systemd_can_stop (logout_dialog->priv->systemd); | |
else | |
@@ -330,7 +330,7 @@ | |
seconds_warning = g_strdup_printf (seconds_warning, logout_dialog->priv->timeout); | |
if (session_type == NULL) { | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) { | |
GsmSystemd *systemd; | |
systemd = gsm_get_systemd (); | |
@@ -345,7 +345,7 @@ | |
session_type = gsm_consolekit_get_current_session_type (consolekit); | |
g_object_unref (consolekit); | |
is_not_login = (g_strcmp0 (session_type, GSM_CONSOLEKIT_SESSION_TYPE_LOGIN_WINDOW) != 0); | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
} | |
#endif | |
} | |
diff -Naur mate-session-manager-1.20.1/mate-session/gsm-manager.c mate-session-manager-elogind-1.20.1/mate-session/gsm-manager.c | |
--- mate-session-manager-1.20.1/mate-session/gsm-manager.c 2018-06-17 10:36:25.000000000 -0400 | |
+++ mate-session-manager-elogind-1.20.1/mate-session/gsm-manager.c 2018-10-09 18:48:33.130975802 -0300 | |
@@ -59,7 +59,7 @@ | |
#include "gsm-logout-dialog.h" | |
#include "gsm-inhibit-dialog.h" | |
#include "gsm-consolekit.h" | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
#include "gsm-systemd.h" | |
#endif | |
#include "gsm-session-save.h" | |
@@ -423,7 +423,7 @@ | |
gtk_main_quit (); | |
} | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
static void | |
quit_request_completed_systemd (GsmSystemd *systemd, | |
GError *error, | |
@@ -445,7 +445,7 @@ | |
gsm_manager_quit (GsmManager *manager) | |
{ | |
GsmConsolekit *consolekit; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
GsmSystemd *systemd; | |
#endif | |
@@ -460,7 +460,7 @@ | |
case GSM_MANAGER_LOGOUT_REBOOT_INTERACT: | |
mdm_set_logout_action (MDM_LOGOUT_ACTION_NONE); | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) { | |
systemd = gsm_get_systemd (); | |
g_signal_connect (systemd, | |
@@ -477,7 +477,7 @@ | |
G_CALLBACK (quit_request_completed_consolekit), | |
GINT_TO_POINTER (MDM_LOGOUT_ACTION_REBOOT)); | |
gsm_consolekit_attempt_restart (consolekit); | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
} | |
#endif | |
break; | |
@@ -489,7 +489,7 @@ | |
case GSM_MANAGER_LOGOUT_SHUTDOWN_INTERACT: | |
mdm_set_logout_action (MDM_LOGOUT_ACTION_NONE); | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) { | |
systemd = gsm_get_systemd (); | |
g_signal_connect (systemd, | |
@@ -506,7 +506,7 @@ | |
G_CALLBACK (quit_request_completed_consolekit), | |
GINT_TO_POINTER (MDM_LOGOUT_ACTION_SHUTDOWN)); | |
gsm_consolekit_attempt_stop (consolekit); | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
} | |
#endif | |
break; | |
@@ -1162,7 +1162,7 @@ | |
static void | |
manager_attempt_hibernate (GsmManager *manager) | |
{ | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) { | |
GsmSystemd *systemd; | |
@@ -1186,7 +1186,7 @@ | |
gsm_consolekit_attempt_hibernate (consolekit); | |
} | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
} | |
#endif | |
} | |
@@ -1194,7 +1194,7 @@ | |
static void | |
manager_attempt_suspend (GsmManager *manager) | |
{ | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) { | |
GsmSystemd *systemd; | |
@@ -1218,7 +1218,7 @@ | |
gsm_consolekit_attempt_suspend (consolekit); | |
} | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
} | |
#endif | |
} | |
@@ -2033,13 +2033,13 @@ | |
maybe_save_session (GsmManager *manager) | |
{ | |
GsmConsolekit *consolekit = NULL; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
GsmSystemd *systemd = NULL; | |
#endif | |
char *session_type; | |
GError *error; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) { | |
systemd = gsm_get_systemd (); | |
session_type = gsm_systemd_get_current_session_type (systemd); | |
@@ -2056,7 +2056,7 @@ | |
if (g_strcmp0 (session_type, GSM_CONSOLEKIT_SESSION_TYPE_LOGIN_WINDOW) == 0) { | |
goto out; | |
} | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
} | |
#endif | |
@@ -2078,7 +2078,7 @@ | |
out: | |
if (consolekit != NULL) | |
g_object_unref (consolekit); | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (systemd != NULL) | |
g_object_unref (systemd); | |
#endif | |
@@ -2577,7 +2577,7 @@ | |
guint status, | |
GsmManager *manager) | |
{ | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) { | |
GsmSystemd *systemd; | |
@@ -2592,7 +2592,7 @@ | |
consolekit = gsm_get_consolekit (); | |
gsm_consolekit_set_session_idle (consolekit, | |
(status == GSM_PRESENCE_STATUS_IDLE)); | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
} | |
#endif | |
} | |
@@ -2798,7 +2798,7 @@ | |
} | |
} | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
static void | |
request_reboot_privileges_completed_systemd (GsmSystemd *systemd, | |
gboolean success, | |
@@ -2831,7 +2831,7 @@ | |
request_reboot (GsmManager *manager) | |
{ | |
GsmConsolekit *consolekit; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
GsmSystemd *systemd; | |
#endif | |
gboolean success; | |
@@ -2860,7 +2860,7 @@ | |
* just work fine. | |
*/ | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) { | |
systemd = gsm_get_systemd (); | |
g_signal_connect (systemd, | |
@@ -2897,7 +2897,7 @@ | |
manager->priv->logout_type = GSM_MANAGER_LOGOUT_REBOOT_MDM; | |
end_phase (manager); | |
} | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
} | |
#endif | |
} | |
@@ -2929,7 +2929,7 @@ | |
} | |
} | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
static void | |
request_shutdown_privileges_completed_systemd (GsmSystemd *systemd, | |
gboolean success, | |
@@ -2962,7 +2962,7 @@ | |
request_shutdown (GsmManager *manager) | |
{ | |
GsmConsolekit *consolekit; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
GsmSystemd *systemd; | |
#endif | |
gboolean success; | |
@@ -2972,7 +2972,7 @@ | |
/* See the comment in request_reboot() for some more details about how | |
* this works. */ | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) { | |
systemd = gsm_get_systemd (); | |
g_signal_connect (systemd, | |
@@ -3009,7 +3009,7 @@ | |
manager->priv->logout_type = GSM_MANAGER_LOGOUT_SHUTDOWN_MDM; | |
end_phase (manager); | |
} | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
} | |
#endif | |
} | |
@@ -3350,14 +3350,14 @@ | |
GError **error) | |
{ | |
GsmConsolekit *consolekit; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
GsmSystemd *systemd; | |
#endif | |
g_debug ("GsmManager: CanShutdown called"); | |
g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) { | |
systemd = gsm_get_systemd (); | |
*shutdown_available = gsm_systemd_can_stop (systemd) | |
@@ -3375,7 +3375,7 @@ | |
|| gsm_consolekit_can_suspend (consolekit) | |
|| gsm_consolekit_can_hibernate (consolekit)); | |
g_object_unref (consolekit); | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
} | |
#endif | |
diff -Naur mate-session-manager-1.20.1/mate-session/gsm-systemd.c mate-session-manager-elogind-1.20.1/mate-session/gsm-systemd.c | |
--- mate-session-manager-1.20.1/mate-session/gsm-systemd.c 2018-06-17 10:36:25.000000000 -0400 | |
+++ mate-session-manager-elogind-1.20.1/mate-session/gsm-systemd.c 2018-10-09 18:48:33.130975802 -0300 | |
@@ -31,7 +31,7 @@ | |
#include <dbus/dbus-glib.h> | |
#include <dbus/dbus-glib-lowlevel.h> | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
#include <systemd/sd-login.h> | |
#endif | |
@@ -492,7 +492,7 @@ | |
DBusMessageIter iter; | |
gchar *session_id = NULL; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
sd_pid_get_session (getpid (), &session_id); | |
#endif | |
@@ -602,7 +602,7 @@ | |
{ | |
GError *error; | |
char *session_id = NULL; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
char *seat_id = NULL; | |
#endif | |
int ret = 0; | |
@@ -616,14 +616,14 @@ | |
return FALSE; | |
} | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
sd_pid_get_session (getpid (), &session_id); | |
#endif | |
if (session_id == NULL) | |
return FALSE; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
sd_session_get_seat (session_id, &seat_id); | |
ret = sd_seat_can_multi_session (seat_id); | |
@@ -870,7 +870,7 @@ | |
GError *gerror; | |
gchar *session_id = NULL; | |
gchar *session_class = NULL; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
int res; | |
#endif | |
@@ -883,14 +883,14 @@ | |
return NULL; | |
} | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
sd_pid_get_session (getpid (), &session_id); | |
#endif | |
if (session_id == NULL) | |
return NULL; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
res = sd_session_get_class (session_id, &session_class); | |
if (res < 0) { | |
g_warning ("Could not get Systemd session class!"); | |
diff -Naur mate-session-manager-1.20.1/mate-session/gsm-util.c mate-session-manager-elogind-1.20.1/mate-session/gsm-util.c | |
--- mate-session-manager-1.20.1/mate-session/gsm-util.c 2018-06-17 10:36:25.000000000 -0400 | |
+++ mate-session-manager-elogind-1.20.1/mate-session/gsm-util.c 2018-10-09 18:48:33.130975802 -0300 | |
@@ -551,7 +551,7 @@ | |
return environment_updated; | |
} | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
gboolean | |
gsm_util_export_user_environment (GError **error) | |
{ | |
@@ -679,7 +679,7 @@ | |
g_clear_error (&error); | |
} | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
/* If this fails, the system user session won't get the updated environment | |
*/ | |
if (!gsm_util_update_user_environment (variable, value, &error)) { | |
diff -Naur mate-session-manager-1.20.1/mate-session/gsm-util.h mate-session-manager-elogind-1.20.1/mate-session/gsm-util.h | |
--- mate-session-manager-1.20.1/mate-session/gsm-util.h 2018-06-17 10:36:25.000000000 -0400 | |
+++ mate-session-manager-elogind-1.20.1/mate-session/gsm-util.h 2018-10-09 18:49:23.666324516 -0300 | |
@@ -50,7 +50,7 @@ | |
gboolean gsm_util_export_activation_environment (GError **error); | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
gboolean gsm_util_export_user_environment (GError **error); | |
#endif | |
diff -Naur mate-session-manager-1.20.1/mate-session/main.c mate-session-manager-elogind-1.20.1/mate-session/main.c | |
--- mate-session-manager-1.20.1/mate-session/main.c 2018-06-17 10:36:25.000000000 -0400 | |
+++ mate-session-manager-elogind-1.20.1/mate-session/main.c 2018-10-09 18:48:33.130975802 -0300 | |
@@ -43,7 +43,7 @@ | |
#include "mdm-log.h" | |
#include "gsm-consolekit.h" | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
#include "gsm-systemd.h" | |
#endif | |
#include "gsm-util.h" | |
@@ -351,13 +351,13 @@ | |
static void maybe_load_saved_session_apps(GsmManager* manager) | |
{ | |
GsmConsolekit* consolekit = NULL; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
GsmSystemd* systemd = NULL; | |
#endif | |
char* session_type; | |
gboolean is_login; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (LOGIND_RUNNING()) { | |
systemd = gsm_get_systemd(); | |
session_type = gsm_systemd_get_current_session_type(systemd); | |
@@ -368,7 +368,7 @@ | |
consolekit = gsm_get_consolekit(); | |
session_type = gsm_consolekit_get_current_session_type(consolekit); | |
is_login = g_strcmp0 (session_type, GSM_CONSOLEKIT_SESSION_TYPE_LOGIN_WINDOW) == 0; | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
} | |
#endif | |
@@ -387,7 +387,7 @@ | |
if (consolekit != NULL) | |
g_object_unref(consolekit); | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
if (systemd != NULL) | |
g_object_unref(systemd); | |
#endif | |
@@ -622,7 +622,7 @@ | |
gsm_util_export_activation_environment (NULL); | |
-#ifdef HAVE_SYSTEMD | |
+#ifdef defined(HAVE_SYSTEMD) || defined(HAVE_LIBELOGIND) | |
gsm_util_export_user_environment (NULL); | |
#endif | |
diff -Naur mate-session-manager-1.20.1/mate-session/Makefile.am mate-session-manager-elogind-1.20.1/mate-session/Makefile.am | |
--- mate-session-manager-1.20.1/mate-session/Makefile.am 2018-06-17 10:36:25.000000000 -0400 | |
+++ mate-session-manager-elogind-1.20.1/mate-session/Makefile.am 2018-10-09 17:21:13.346423237 -0300 | |
@@ -7,6 +7,7 @@ | |
AM_CPPFLAGS = \ | |
$(MATE_SESSION_CFLAGS) \ | |
$(SYSTEMD_CFLAGS) \ | |
+ $(LIBELOGIND_CFLAGS) \ | |
$(DISABLE_DEPRECATED_CFLAGS) | |
AM_CFLAGS = $(WARN_CFLAGS) | |
@@ -80,6 +81,7 @@ | |
$(XEXT_LIBS) \ | |
$(MATE_SESSION_LIBS) \ | |
$(SYSTEMD_LIBS) \ | |
+ $(LIBELOGIND_LIBS) \ | |
$(EXECINFO_LIBS) | |
libgsmutil_la_SOURCES = \ | |
diff -Naur mate-session-manager-1.20.1/mate-session/Makefile.in mate-session-manager-elogind-1.20.1/mate-session/Makefile.in | |
--- mate-session-manager-1.20.1/mate-session/Makefile.in 2018-06-17 10:57:19.000000000 -0400 | |
+++ mate-session-manager-elogind-1.20.1/mate-session/Makefile.in 2018-10-09 17:23:16.279447239 -0300 | |
@@ -258,6 +258,7 @@ | |
GREP = @GREP@ | |
GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@ | |
HAVE_SYSTEMD = @HAVE_SYSTEMD@ | |
+HAVE_LIBELOGIND = @HAVE_LIBELOGIND@ | |
HAVE_XRENDER = @HAVE_XRENDER@ | |
HAVE_XTEST = @HAVE_XTEST@ | |
HAVE_XTRANS = @HAVE_XTRANS@ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment