Merge lp:~3v1n0/gnome-session/upstart-export-variables into lp:~ubuntu-desktop/gnome-session/ubuntu

[Marco Trevisan (Treviño)]

debian/patches/export_env_to_upstart.patch:
  - Export environment variables to upstart as well, if available

[lp:~3v1n0/gnome-session/upstart-export-variables]

337. By Marco Trevisan (Treviño) on 2016-04-28

debian/patches/export_env_to_upstart.patch: update infos about the forwarding status

[Marco Trevisan (Treviño) (3v1n0)]

In terms of calls duration, this is what I'm getting (when using logging before calls as shown in http://paste.ubuntu.com/16378057/):

gsm_util_setenv: LC_TIME='it_IT.UTF-8'
Dbus env update duration 20.416000 ms
Upstart env update duration 76.193000 ms

gsm_util_setenv: LC_NUMERIC='it_IT.UTF-8'
Dbus env update duration 11.500000 ms
Upstart env update duration 19.927000 ms

gsm_util_setenv: LC_MONETARY='it_IT.UTF-8'
Dbus env update duration 17.485000 ms
Upstart env update duration 26.957000 ms

gsm_util_setenv: LC_MEASUREMENT='it_IT.UTF-8'
Dbus env update duration 70.707000 ms
Upstart env update duration 22.770000 ms

gsm_util_setenv: LC_PAPER='it_IT.UTF-8'
Dbus env update duration 8.911000 ms
Upstart env update duration 4.370000 ms

gsm_util_setenv: QT_IM_MODULE='ibus'
Dbus env update duration 1.217000 ms
Upstart env update duration 2.675000 ms

gsm_util_setenv: XMODIFIERS='@im=ibus'
Dbus env update duration 1.165000 ms
Upstart env update duration 2.649000 ms

gsm_util_setenv: GNOME_DESKTOP_SESSION_ID='this-is-deprecated'
Dbus env update duration 1.074000 ms
Upstart env update duration 2.670000 ms

gsm_util_setenv: XDG_MENU_PREFIX='gnome-'
Dbus env update duration 2.086000 ms
Upstart env update duration 1.818000 ms

gsm_util_setenv: SESSION_MANAGER='local/ubuntu-vmware:@/tmp/.ICE-unix/5129,unix/ubuntu-vmware:/tmp/.ICE-unix/5129'
Dbus env update duration 1.219000 ms
Upstart env update duration 0.515000 ms

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-11 23:34:19 +0000
+++ debian/changelog	2016-04-28 10:51:43 +0000
@@ -1,3 +1,10 @@
+gnome-session (3.18.1.2-1ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/patches/export_env_to_upstart.patch:
+    - Export environment variables to upstart as well, if available (LP: #1433013)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Thu, 28 Apr 2016 12:13:32 +0200
+
 gnome-session (3.18.1.2-1ubuntu1) xenial; urgency=medium
 
   * Merge from Debian unstable.  Remaining changes (LP: #1512914):

=== added file 'debian/patches/export_env_to_upstart.patch'
--- debian/patches/export_env_to_upstart.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/export_env_to_upstart.patch	2016-04-28 10:51:43 +0000
@@ -0,0 +1,78 @@
+Description: Export environment variables to upstart as well, if available
+Author: Marco Trevisan <[e-mail]>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=765717
+Bug-Ubuntu: https://launchpad.net/bugs/1433013
+Forwarded: yes
+
+Index: gnome-session-3.18.1.2/gnome-session/gsm-util.c
+===================================================================
+--- gnome-session-3.18.1.2.orig/gnome-session/gsm-util.c
++++ gnome-session-3.18.1.2/gnome-session/gsm-util.c
+@@ -491,6 +491,52 @@ gsm_util_update_activation_environment (
+         return environment_updated;
+ }
+ 
++static gboolean
++gsm_util_update_upstart_environment (const char  *variable,
++                                     const char  *value,
++                                     GError     **error)
++{
++        GDBusConnection *connection;
++        gboolean         environment_updated;
++        GVariant        *reply;
++        GError          *bus_error = NULL;
++        gchar           *environment_string;
++
++        environment_updated = FALSE;
++        connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, error);
++
++        if (connection == NULL) {
++                return FALSE;
++        }
++
++        environment_string = g_strdup_printf ("%s=%s", variable, value);
++        reply = g_dbus_connection_call_sync (connection,
++                                             "com.ubuntu.Upstart",
++                                             "/com/ubuntu/Upstart",
++                                             "com.ubuntu.Upstart0_6",
++                                             "SetEnv",
++                                             g_variant_new ("(@assb)",
++                                                            g_variant_new_array (G_VARIANT_TYPE_STRING, NULL, 0),
++                                                            environment_string,
++                                                            TRUE),
++                                             NULL,
++                                             G_DBUS_CALL_FLAGS_NONE,
++                                             -1, NULL, &bus_error);
++
++
++        if (bus_error != NULL) {
++                g_propagate_error (error, bus_error);
++        } else {
++                environment_updated = TRUE;
++                g_variant_unref (reply);
++        }
++
++        g_clear_object (&connection);
++        g_free (environment_string);
++
++        return environment_updated;
++}
++
+ void
+ gsm_util_setenv (const char *variable,
+                  const char *value)
+@@ -509,6 +555,13 @@ gsm_util_setenv (const char *variable,
+          */
+         if (!gsm_util_update_activation_environment (variable, value, &bus_error)) {
+                 g_warning ("Could not make bus activated clients aware of %s=%s environment variable: %s", variable, value, bus_error->message);
+-                g_error_free (bus_error);
++                g_clear_error (&bus_error);
++        }
++
++        if (g_getenv ("UPSTART_SESSION") != NULL) {
++                if (!gsm_util_update_upstart_environment (variable, value, &bus_error)) {
++                        g_warning ("Could not make upstart activated jobs aware of %s=%s environment variable: %s", variable, value, bus_error->message);
++                        g_clear_error (&bus_error);
++                }
+         }
+ }

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-06-05 19:54:05 +0000
+++ debian/patches/series	2016-04-28 10:51:43 +0000
@@ -6,3 +6,4 @@
 53_add_sessionmigration.patch
 95_dbus_request_shutdown.patch
 103_kill_the_fail_whale.patch
+export_env_to_upstart.patch