# Ported from gnome-session git commit b6d98eb76b1d56da2d7202944a748723b58ece4a
# (3.12.2020) - "main: Warn about failures to update the environment"
# (https://github.com/GNOME/gnome-session/commit/b6d98eb):
# =============================================================================
# Closes: #71 (https://gitlab.gnome.org/GNOME/gnome-session/-/issues/71) -
# "gsm_util_export_user_environment should log an error if the
# UnsetAndSetEnvironment D-Bus call failed"
#

diff -up mate-session-manager-f56f8cd63d330e576aeabd09a0600a8da2e02392/mate-session/main.c~ mate-session-manager-f56f8cd63d330e576aeabd09a0600a8da2e02392/mate-session/main.c
--- mate-session-manager-f56f8cd63d330e576aeabd09a0600a8da2e02392/mate-session/main.c~	2021-05-16 23:44:55.773606120 +0200
+++ mate-session-manager-f56f8cd63d330e576aeabd09a0600a8da2e02392/mate-session/main.c	2021-05-16 23:44:55.780606166 +0200
@@ -647,10 +647,18 @@ int main(int argc, char** argv)
 		exit(1);
 	}
 
-        gsm_util_export_activation_environment (NULL);
+        gsm_util_export_activation_environment (&error);
+        if (error) {
+                g_warning ("Failed to upload environment to DBus: %s", error->message);
+                g_clear_error (&error);
+        }
 
 #ifdef HAVE_SYSTEMD
-        gsm_util_export_user_environment (NULL);
+        gsm_util_export_user_environment (&error);
+        if (error) {
+                g_warning ("Failed to upload environment to systemd: %s", error->message);
+                g_clear_error (&error);
+        }
 #endif
 
 	mdm_log_init();