summaryrefslogtreecommitdiffstats
path: root/debian/patches/main-Warn-about-failures-to-update-the-environment.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 14:41:01 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-27 14:41:01 +0000
commit1a2738532d1c95e1d48701628cd81ca96c267761 (patch)
treea67781318e259d176e6d6d056501bc6a372a8453 /debian/patches/main-Warn-about-failures-to-update-the-environment.patch
parentAdding upstream version 3.38.0. (diff)
downloadgnome-session-8ca18f2bdba93ac6da862dbb10791a025ec661bb.tar.xz
gnome-session-8ca18f2bdba93ac6da862dbb10791a025ec661bb.zip
Adding debian version 3.38.0-4.debian/3.38.0-4debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/main-Warn-about-failures-to-update-the-environment.patch')
-rw-r--r--debian/patches/main-Warn-about-failures-to-update-the-environment.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/debian/patches/main-Warn-about-failures-to-update-the-environment.patch b/debian/patches/main-Warn-about-failures-to-update-the-environment.patch
new file mode 100644
index 0000000..c035b05
--- /dev/null
+++ b/debian/patches/main-Warn-about-failures-to-update-the-environment.patch
@@ -0,0 +1,37 @@
+From: Benjamin Berg <bberg@redhat.com>
+Date: Mon, 19 Oct 2020 12:20:44 +0200
+Subject: main: Warn about failures to update the environment
+
+Bug: https://gitlab.gnome.org/GNOME/gnome-session/-/issues/71
+Origin: upstream, 40, commit:b6d98eb76b1d56da2d7202944a748723b58ece4a
+---
+ gnome-session/main.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/gnome-session/main.c b/gnome-session/main.c
+index 53f174e..443bc04 100644
+--- a/gnome-session/main.c
++++ b/gnome-session/main.c
+@@ -529,12 +529,20 @@ main (int argc, char **argv)
+ }
+ }
+
+- 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);
++ }
+
+ session_name = opt_session_name;
+
+ #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
+
+ #ifdef ENABLE_SYSTEMD_SESSION