? ariel.install
? gdm2-atspi-libexec.patch
? gdm2-atspi-main-doc.patch
? gdm2-atspi-main.patch
? gdm2-atspi-oldspi.patch
? gdm2-atspi.patch
? gdmsetup
? daemon/slave-ariel.c
? gui/babalu
? gui/babalu.patch
? gui/gdm-atspi-take-one.patch
? gui/gdm-atspi.patch
? gui/gdm2-atspi-main.patch
? gui/gdmsetup.cc
? gui/pato.patch
? gui/greeter/greeter_item_ulist.c.ariel-back
Index: gui/gdmcommon.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/gdmcommon.c,v
retrieving revision 1.31
diff -u -r1.31 gdmcommon.c
--- gui/gdmcommon.c	9 Oct 2006 15:30:30 -0000	1.31
+++ gui/gdmcommon.c	25 Oct 2006 20:10:50 -0000
@@ -622,45 +622,33 @@
      return GDK_FILTER_CONTINUE;
 }
 
-
-static void
-error_dialog (void)
-{
-	GtkWidget *dialog = gtk_message_dialog_new (NULL,
-						    GTK_DIALOG_MODAL,
-						    GTK_MESSAGE_ERROR,
-						    GTK_BUTTONS_OK,
-						    _("Assistive technology support has been requested for this session, but the accessibility registry was not found.  Please ensure that the AT-SPI package is installed. Your session has been started without assistive technology support."));
-	gtk_dialog_run (GTK_DIALOG (dialog));
-	gtk_widget_destroy (dialog);
-}
-
-
-
 static gboolean
 filter_timeout (gpointer data)
 {
-	error_dialog ();
+	gdm_common_info (_("The accessibility registry was not found."));
 
 	gtk_main_quit ();
 
 	return FALSE;
 }
 
-
 void
 gdm_common_atspi_launch (void)
 {
 	GdkWindow *w = gdk_get_default_root_window (); 
+	gboolean a11y = gdm_config_get_bool (GDM_KEY_ADD_GTK_MODULES);
 	guint tid;
+
+	if (! a11y)
+		return;
  
 	if ( ! AT_SPI_IOR)
 		AT_SPI_IOR = XInternAtom (GDK_DISPLAY (), "AT_SPI_IOR", False);
 
 	gdk_window_set_events (w,  GDK_PROPERTY_CHANGE_MASK); 
 	
-	if ( ! pre_atspi_launch ()){
-		error_dialog ();
+	if ( ! pre_atspi_launch ()) {
+		gdm_common_info (_("The accessibility registry could not be started."));
 		
 		return;
 	}
Index: gui/greeter/greeter.c
===================================================================
RCS file: /cvs/gnome/gdm2/gui/greeter/greeter.c,v
retrieving revision 1.134
diff -u -r1.134 greeter.c
--- gui/greeter/greeter.c	20 Oct 2006 23:53:59 -0000	1.134
+++ gui/greeter/greeter.c	25 Oct 2006 20:10:50 -0000
@@ -1051,9 +1051,9 @@
    */
   gdk_init (&argc, &argv);
   if (! DOING_GDM_DEVELOPMENT) {
-     gdm_common_atspi_launch ();
+       gdm_common_atspi_launch ();
   }
-
+  
   gtk_init (&argc, &argv);
 
   gdm_common_setup_cursor (GDK_WATCH);
