~robert-ancell/lightdm/xorg-displayfd

« back to all changes in this revision

Viewing changes to debian/patches/01_transition_ubuntu2d_ubuntu_desktop.patch

  • Committer: Robert Ancell
  • Date: 2015-08-10 00:13:50 UTC
  • mfrom: (1947.2.216 trunk)
  • Revision ID: robert.ancell@canonical.com-20150810001350-mrigcdovq3xkw68u
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Description: Remove unity-2d (not anymore supported) and transition to unity
2
 
#              starting from quantal. llvmpipe is used in case no hardware
3
 
#              acceleration is available.
4
 
=== modified file 'common/user-list.c'
5
 
Index: trunk/common/user-list.c
6
 
===================================================================
7
 
--- trunk.orig/common/user-list.c       2014-02-08 17:09:03.157580601 -0500
8
 
+++ trunk/common/user-list.c    2014-02-08 17:34:52.897555476 -0500
9
 
@@ -1219,6 +1219,12 @@
10
 
 
11
 
     if (!priv->path)
12
 
         load_dmrc (user);
13
 
+
14
 
+    if (g_strcmp0 (priv->session, "ubuntu-2d") == 0)
15
 
+    {
16
 
+        g_free(priv->session);
17
 
+        priv->session = g_strdup ("ubuntu");
18
 
+    }
19
 
 }
20
 
 
21
 
 /**