--- a/ChangeLog	Sat Oct 09 10:22:35 2010 +0000
+++ b/ChangeLog	Mon Oct 11 10:05:38 2010 +0000
@@ -1,3 +1,7 @@
+2010-10-11  Jeff Cai <[email protected]>
+
+	* patches/gdm-12-setfacl.diff: Fix d.o.o bug #6984148
+
 2010-10-09  Ghee Teo  <[email protected]>
 
 	Uprev to 1.4.12 to include fix for bugster#6983065.

--- a/patches/gdm-12-setfacl.diff	Sat Oct 09 10:22:35 2010 +0000
+++ b/patches/gdm-12-setfacl.diff	Mon Oct 11 10:05:38 2010 +0000
@@ -1,14 +1,6 @@
-commit 5c3d0475ddd123d9a6748d8ab3b1d4cb0335f43e
-Author: Halton Huo <[email protected]>
-Date:   Fri Jul 2 16:30:11 2010 +0800
-
-    gdm-13-setfacl.diff
-
-diff --git a/daemon/gdm-welcome-session.c b/daemon/gdm-welcome-session.c
-index 426e3d0..dd89194 100644
---- a/daemon/gdm-welcome-session.c
-+++ b/daemon/gdm-welcome-session.c
-@@ -371,7 +371,7 @@ get_welcome_environment (GdmWelcomeSession *welcome_session)
+--- gdm-2.30.5/daemon/gdm-welcome-session.c.orig	2010-09-27 17:52:15.025543154 +0800
++++ gdm-2.30.5/daemon/gdm-welcome-session.c	2010-09-27 17:52:09.623508277 +0800
+@@ -371,7 +371,7 @@
                  "LANG", "LANGUAGE", "LC_CTYPE", "LC_NUMERIC", "LC_TIME",
                  "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER",
                  "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT",
@@ -17,7 +9,7 @@
                  NULL
          };
          int i;
-@@ -891,6 +891,31 @@ gdm_welcome_session_spawn (GdmWelcomeSession *welcome_session)
+@@ -891,6 +891,35 @@
                  /* FIXME: */
          }
  
@@ -38,18 +30,22 @@
 +                        g_warning ("Could not run utaudio: %s", error->message);
 +                        g_error_free (error);
 +                        g_free (out);
-+                } else if (g_file_test (out, G_FILE_TEST_EXISTS)) {
++                } else {
 +                        out = g_strstrip (out);
-+                        if (out && out[0] != '\0') {
-+                                g_setenv ("AUDIODEV", out, TRUE);
++                        if (g_file_test (out, G_FILE_TEST_EXISTS)) {
++                               if (out && out[0] != '\0') {
++                                   g_setenv ("AUDIODEV", out, TRUE);
++                               }
 +                        }
++                        else
++                               g_warning ("The audio device file %s doesn't exist", out);
 +                }
 +        }
 +
          env = get_welcome_environment (welcome_session);
  
          error = NULL;
-@@ -899,6 +924,67 @@ gdm_welcome_session_spawn (GdmWelcomeSession *welcome_session)
+@@ -899,6 +928,67 @@
          log_path = g_build_filename (LOGDIR, log_file, NULL);
          g_free (log_file);