--- a/ChangeLog	Thu Jul 23 15:46:13 2009 +0000
+++ b/ChangeLog	Thu Jul 23 16:16:05 2009 +0000
@@ -1,3 +1,8 @@
+2009-07-23  Ghee Teo <[email protected]>
+
+	Repatch to fix gnome-about popping up on new gdm 2.27.x login screen.
+	* patches/gnome-session-02-gnome-about.diff:
+
 2009-07-23  Christian Kelly  <[email protected]>
 
         * base-specs/gvfs.spec: Unbump to 1.3.1, build issues.

--- a/patches/gnome-session-02-gnome-about.diff	Thu Jul 23 15:46:13 2009 +0000
+++ b/patches/gnome-session-02-gnome-about.diff	Thu Jul 23 16:16:05 2009 +0000
@@ -1,5 +1,6 @@
---- gnome-session-2.26.1/gnome-session/gsm-manager.c.ori	2009-04-15 07:31:14.825694454 +0100
-+++ gnome-session-2.26.1/gnome-session/gsm-manager.c	2009-04-15 07:33:02.709285954 +0100
+diff -urN -x '*.orig' gnome-session-2.27.4/gnome-session/gsm-manager.c ../SUNWgnome-session-2.26.1.hacked/gnome-session-2.27.4/gnome-session/gsm-manager.c
+--- gnome-session-2.27.4/gnome-session/gsm-manager.c	2009-07-23 15:42:09.679931892 +0100
++++ ../SUNWgnome-session-2.26.1.hacked/gnome-session-2.27.4/gnome-session/gsm-manager.c	2009-07-23 15:50:29.967601535 +0100
 @@ -376,6 +376,22 @@
  }
  
@@ -33,11 +34,14 @@
          g_debug ("GsmManager: GSM starting to manage");
  
          g_return_if_fail (GSM_IS_MANAGER (manager));
-@@ -1283,6 +1302,10 @@
+@@ -1283,6 +1302,13 @@
          gsm_manager_set_phase (manager, GSM_MANAGER_PHASE_INITIALIZATION);
          debug_app_summary (manager);
          start_phase (manager);
 +
++	/* Do not attempt to show gnome-about dialog if user is gdm (uid 50) */
++	if (getuid()==50)
++		return;
 +	gconf_client = gconf_client_get_default ();
 +	show_about = gconf_client_get_bool (gconf_client, ABOUT_PROMPT_KEY, NULL);
 +	if (!show_about) gtk_timeout_add (4000, show_gnome_about, NULL);