Merge lp:~darkxst/gnome-session/lp1224217 into lp:~ubuntu-desktop/gnome-session/ubuntu

[Tim Lunn]

see also patches for g-s-d and u-s-d

[Alberts Muktupāvels (muktupavels)]

Tim, could be that this has introduced bug?

After I updated gnome-session package I was not able to login in session. And in ubuntu forum there are user with same problem I was experiencing - http://ubuntuforums.org/showthread.php?t=2211609

In .xsession-errors:
init: Failed to obtain gnome-session instance: Unknown parameter: XDG_CURRENT_DESKTOP

I fixed it by adding X-LightDM-DesktopName=GNOME in session's .desktop file. Seems all sessions which will miss X-LightDM-DesktoName wont be able to start.

[Tim Lunn (darkxst)]

What session are you using? And yes all sessions should define x-lightdm-desktopname or risk random brokenness among upstart user sessions

--
Tim

On Monday, 17 March 2014 at 9:47 pm, Alberts Muktupāvels wrote:

> Tim, could be that this has introduced bug?
>
> After I updated gnome-session package I was not able to login in session. And in ubuntu forum there are user with same problem I was experiencing - http://ubuntuforums.org/showthread.php?t=2211609
>
> In .xsession-errors:
> init: Failed to obtain gnome-session instance: Unknown parameter: XDG_CURRENT_DESKTOP
>
> I fixed it by adding X-LightDM-DesktopName=GNOME in session's .desktop file. Seems all sessions which will miss X-LightDM-DesktoName wont be able to start.
> --
> https://code.launchpad.net/~darkxst/gnome-session/lp1224217/+merge/210912
> You are the owner of lp:~darkxst/gnome-session/lp1224217.
>
>

[Alberts Muktupāvels (muktupavels)]

I am using flashback session, but I am not using ubuntu version. Now when I know that x-lightdm-desktop name is needed this is not problem for me.

Isn't there a way to set XDG_CURRENT_DESKTOP to some default value or empty value? So starting session does not stop with error - Unknown parameter: XDG_CURRENT_DESKTOP?

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-20 08:06:44 +0000
+++ debian/changelog	2014-03-13 21:24:06 +0000
@@ -1,3 +1,11 @@
+gnome-session (3.9.90-0ubuntu12) UNRELEASED; urgency=medium
+
+  * gnome-session-bin.user-session.upstart: Use XDG_CURRENT_DESKTOP
+    as the instance specifier for gnome-session upstart jobs, since 
+    other sessions apart from ubuntu will need to use u-s-d (LP: #1224217)
+
+ -- Tim Lunn <[e-mail]>  Wed, 12 Mar 2014 16:27:59 +1100
+
 gnome-session (3.9.90-0ubuntu11) trusty; urgency=medium
 
   * debian/50-ubuntu.conf:

=== modified file 'debian/gnome-session-bin.user-session.upstart'
--- debian/gnome-session-bin.user-session.upstart	2014-02-20 02:02:54 +0000
+++ debian/gnome-session-bin.user-session.upstart	2014-03-13 21:24:06 +0000
@@ -2,12 +2,12 @@
 author "Stéphane Graber <[e-mail]>"
 
 start on started dbus and xsession SESSIONTYPE=gnome-session
-stop on starting gnome-session INSTANCE!=$DESKTOP_SESSION
+stop on starting gnome-session INSTANCE!=$XDG_CURRENT_DESKTOP
 
 env GNOME_DESKTOP_SESSION_ID=this-is-deprecated
 export GNOME_DESKTOP_SESSION_ID
 
-instance $DESKTOP_SESSION
+instance $XDG_CURRENT_DESKTOP
 
 emits desktop-start
 emits desktop-end