[gnome-panel] panel-session: unset DESKTOP_AUTOSTART_ID

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 5094f97aa7a5044c1f1ad11b4e44828111aa71f3
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Jul 11 01:58:44 2015 +0300

    panel-session: unset DESKTOP_AUTOSTART_ID

 gnome-panel/panel-session.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/gnome-panel/panel-session.c b/gnome-panel/panel-session.c
index 7ee8bf2..6422105 100644
--- a/gnome-panel/panel-session.c
+++ b/gnome-panel/panel-session.c
@@ -261,6 +261,7 @@ panel_session_register_client (PanelSession *session)
        GError              *error;
        const gchar         *app_id;
        const gchar         *client_startup_id;
+       gchar               *startup_id;
        GVariant            *parameters;
        GVariant            *res;
        gchar               *object_path;
@@ -270,7 +271,15 @@ panel_session_register_client (PanelSession *session)
        app_id = "gnome-panel";
        client_startup_id = g_getenv ("DESKTOP_AUTOSTART_ID");
 
-       parameters = g_variant_new ("(ss)", app_id, client_startup_id ? client_startup_id : "");
+       if (client_startup_id != NULL) {
+               startup_id = g_strdup (client_startup_id);
+               g_unsetenv ("DESKTOP_AUTOSTART_ID");
+       } else {
+               startup_id = g_strdup ("");
+       }
+
+       parameters = g_variant_new ("(ss)", app_id, startup_id);
+       g_free (startup_id);
 
        res = g_dbus_proxy_call_sync (priv->session_manager_proxy,
                                      "RegisterClient",