main.c: Reset the activation environment at the end of the

session.

Also, skip blacklisted env variables for the user environment.

upstream refs:
https://gitlab.gnome.org/GNOME/gnome-session/-/commit/bb4842dd785dc85bef4c382c391d65700d0b3f64
https://gitlab.gnome.org/GNOME/gnome-session/-/commit/d44888fb304e9d957805bf052bf879b0f50568be

Author: mtwebster

cinnamon-session/csm-util.c

@@ -673,6 +673,8 @@ csm_util_export_user_environment (GError     **error)
         g_variant_builder_open (&builder, G_VARIANT_TYPE ("as"));
         for (i = 0; variable_unsetlist[i] != NULL; i++)
                 g_variant_builder_add (&builder, "s", variable_unsetlist[i]);
+        for (i = 0; variable_blacklist[i] != NULL; i++)
+                g_variant_builder_add (&builder, "s", variable_blacklist[i]);
         g_variant_builder_close (&builder);
 
         g_variant_builder_open (&builder, G_VARIANT_TYPE ("as"));

cinnamon-session/main.c

@@ -291,6 +291,8 @@ main (int argc, char **argv)
                 g_object_unref (manager);
         }
 
+        csm_util_export_activation_environment (NULL);
+
         g_bus_unown_name (name_owner_id);
 
         mdm_log_shutdown ();