~ubuntu-branches/ubuntu/raring/lightdm/raring-security

Tags: 1.4.0-0ubuntu2

* debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch:
- Fix 2d->3d transition to handle new support for accountsservice
LP: #1059137

added added

removed removed

=== modified file 'liblightdm-gobject/user.c'

Index: lightdm/liblightdm-gobject/user.c

===================================================================

--- lightdm.orig/liblightdm-gobject/user.c 2012-06-21 11:47:32.575536000 +1200

+++ lightdm/liblightdm-gobject/user.c 2012-06-21 11:49:07.598538140 +1200

@@ -1159,6 +1159,12 @@

if (priv->session)

g_free (priv->session);

priv->session = g_key_file_get_string (priv->dmrc_file, "Desktop", "Session", NULL);

--- lightdm.orig/liblightdm-gobject/user.c 2012-10-08 09:22:00.499038253 -0400

+++ lightdm/liblightdm-gobject/user.c 2012-10-09 10:26:25.721700862 -0400

@@ -1314,6 +1314,12 @@

load_dmrc (user);

load_accounts_service (user); // overrides dmrc values

+ if (g_strcmp0 (priv->session, "ubuntu-2d") == 0)

+ {

+ g_free(priv->session);

+ priv->session = g_strdup ("ubuntu");

+ }

}

static GVariant *

/* Ensure a few guarantees */

if (priv->layouts == NULL)

{