diff -u --exclude-from=EXCLUDE2.files gnome-control-center.orig/capplets/accessibility/at-properties/at-enable-dialog.glade gnome-control-center/capplets/accessibility/at-properties/at-enable-dialog.glade
--- gnome-control-center.orig/capplets/accessibility/at-properties/at-enable-dialog.glade	2007-01-12 13:46:14.000000000 -0600
+++ gnome-control-center/capplets/accessibility/at-properties/at-enable-dialog.glade	2007-01-16 08:57:25.000000000 -0600
@@ -12,6 +12,13 @@
   <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -33,6 +40,7 @@
 	      <property name="label">gtk-help</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-11</property>
 	    </widget>
 	  </child>
@@ -44,6 +52,7 @@
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">0</property>
 
 	      <child>
@@ -53,6 +62,10 @@
 		  <property name="yalign">0.5</property>
 		  <property name="xscale">0</property>
 		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
 
 		  <child>
 		    <widget class="GtkHBox" id="hbox1">
@@ -88,6 +101,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -111,6 +128,7 @@
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-7</property>
 	    </widget>
 	  </child>
@@ -155,6 +173,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -197,6 +219,7 @@
 			      <property name="label" translatable="yes">_Enable assistive technologies</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
@@ -221,6 +244,10 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -282,6 +309,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
 		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -320,7 +351,7 @@
 			  <child>
 			    <widget class="GtkLabel" id="at_applications_label">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Start these assistive technologies every time you log in:</property>
+			      <property name="label" translatable="yes">Select and start assistive technologies every time you log in:</property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -330,6 +361,10 @@
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">6</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -339,83 +374,18 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="at_screenreader_toggle">
+			    <widget class="GtkButton" id="at_pref_button">
+			      <property name="width_request">50</property>
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Screenreader</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="at_magnifier_toggle">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Magnifier</property>
-			      <property name="use_underline">True</property>
+			      <property name="label">gtk-preferences</property>
+			      <property name="use_stock">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="at_keyboard_toggle">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_On-screen keyboard</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHSeparator" id="at_applications_hseparator">
-			      <property name="visible">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="at_applications_warning_label">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes"></property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">True</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">True</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
+			      <property name="focus_on_click">True</property>
+			      <accessibility>
+				<atkproperty name="AtkObject::accessible_name" translatable="yes">AT Preferences</atkproperty>
+			      </accessibility>
+			      <signal name="activate" handler="on_at_pref_button_activate" last_modification_time="Mon, 08 Jan 2007 19:56:50 GMT"/>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
diff -u --exclude-from=EXCLUDE2.files gnome-control-center.orig/capplets/accessibility/at-properties/main.c gnome-control-center/capplets/accessibility/at-properties/main.c
--- gnome-control-center.orig/capplets/accessibility/at-properties/main.c	2007-01-12 13:46:14.000000000 -0600
+++ gnome-control-center/capplets/accessibility/at-properties/main.c	2007-01-16 13:22:57.000000000 -0600
@@ -10,64 +10,9 @@
 
 #define ACCESSIBILITY_KEY       "/desktop/gnome/interface/accessibility"
 #define ACCESSIBILITY_KEY_DIR   "/desktop/gnome/interface"
-#define AT_STARTUP_DIR          "/desktop/gnome/accessibility/startup"
-#define AT_STARTUP_KEY          "/desktop/gnome/accessibility/startup/exec_ats"
-#define SR_PREFS_DIR            "/apps/gnopernicus/srcore"
 
 static AtStartupState at_startup_state, at_startup_state_initial;
 
-static void
-init_startup_state (GladeXML *dialog)
-{
-	GConfClient *client = gconf_client_get_default ();
-	
-	at_startup_state.flags = (gconf_client_get_bool (client, 
-							 ACCESSIBILITY_KEY, 
-							 NULL)) ? 1 : 0;
-
-	at_startup_state_init (&at_startup_state);
-
-	at_startup_state_initial.flags = at_startup_state.flags;
-	g_object_unref (client);
-
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_keyboard_toggle")),
-				      at_startup_state.enabled.osk);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_screenreader_toggle")),
-				      at_startup_state.enabled.screenreader);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_magnifier_toggle")),
-				      at_startup_state.enabled.magnifier);
-
-	gtk_widget_set_sensitive (WID ("at_keyboard_toggle"),
-				  at_startup_state.enabled.osk_installed);
-	gtk_widget_set_sensitive (WID ("at_screenreader_toggle"),
-				  at_startup_state.enabled.screenreader_installed);
-	gtk_widget_set_sensitive (WID ("at_magnifier_toggle"),
-				  at_startup_state.enabled.magnifier_installed);
-
-	if (at_startup_state.enabled.osk_installed &&
-	    at_startup_state.enabled.screenreader_installed &&
-	    at_startup_state.enabled.magnifier_installed) {
-		gtk_widget_hide (WID ("at_applications_warning_label"));
-		gtk_widget_hide (WID ("at_applications_hseparator"));
-	} else {
-		gchar *warning_label;
-
-		gtk_widget_show (WID ("at_applications_warning_label"));
-		gtk_widget_show (WID ("at_applications_hseparator"));
-		if (!at_startup_state.enabled.osk_installed &&
-		    !(at_startup_state.enabled.screenreader_installed ||
-		      at_startup_state.enabled.magnifier_installed)) {
-			warning_label = g_strdup_printf ("<i>%s</i>", _("No Assistive Technology is available on your system.  The 'gok' package must be installed in order to get on-screen keyboard support, and the 'orca' package must be installed for screenreading and magnifying capabilities."));
-		} else if (!at_startup_state.enabled.osk_installed) {
-			warning_label = g_strdup_printf ("<i>%s</i>", _("Not all available assistive technologies are installed on your system.  The 'gok' package must be installed in order to get on-screen keyboard support."));
-		} else {
-			warning_label = g_strdup_printf ("<i>%s</i>", _("Not all available assistive technologies are installed on your system.  The 'orca' package must be installed for screenreading and magnifying capabilities."));
-		}
-		gtk_label_set_markup (GTK_LABEL (WID ("at_applications_warning_label")), warning_label);
-		g_free (warning_label);
-	}
-}
-
 static GladeXML *
 create_dialog (void)
 {
@@ -88,6 +33,12 @@
 }
 
 static void
+cb_at_preferences (GtkDialog *dialog, gint response_id)
+{
+	g_spawn_command_line_async("gnome-default-applications-properties", NULL);
+}
+
+static void
 cb_dialog_response (GtkDialog *dialog, gint response_id)
 {
 	GnomeClient *client;
@@ -112,33 +63,13 @@
 close_logout_update (GladeXML *dialog)
 {
 	GConfClient *client = gconf_client_get_default ();
-	gboolean has_changed = 
-		(at_startup_state.flags != at_startup_state_initial.flags) && 
-		gconf_client_get_bool (client, ACCESSIBILITY_KEY, NULL);
+	gboolean has_changed = gconf_client_get_bool (client, ACCESSIBILITY_KEY, NULL);
 
 	gtk_widget_set_sensitive (WID ("at_close_logout_button"), has_changed);
 	g_object_unref (client);
 }
 
 static void
-at_startup_toggled (GtkToggleButton *toggle_button,
-		    GladeXML        *dialog)
-{
-	if (toggle_button == GTK_TOGGLE_BUTTON (WID ("at_keyboard_toggle"))) {
-		at_startup_state.enabled.osk = gtk_toggle_button_get_active (toggle_button);
-	}
-	else if (toggle_button == GTK_TOGGLE_BUTTON (WID ("at_magnifier_toggle"))) {
-		at_startup_state.enabled.magnifier = gtk_toggle_button_get_active (toggle_button);
-	}
-	else if (toggle_button == GTK_TOGGLE_BUTTON (WID ("at_screenreader_toggle"))) {
-		at_startup_state.enabled.screenreader = gtk_toggle_button_get_active (toggle_button);
-	}
-	
-	at_startup_state_update (&at_startup_state);
-	close_logout_update (dialog);
-}
-
-static void
 at_enable_toggled (GtkToggleButton *toggle_button, 
 		   GladeXML        *dialog)
 {
@@ -153,20 +84,6 @@
 }
 
 static void
-at_startup_update_ui (GConfClient *client,
-		      GladeXML    *dialog)
-{
-	at_startup_state_init (&at_startup_state);
-  
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_keyboard_toggle")),
-				      at_startup_state.enabled.osk);	
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_screenreader_toggle")),
-				      at_startup_state.enabled.screenreader);	
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("at_magnifier_toggle")),
-				      at_startup_state.enabled.magnifier);	
-}
-
-static void
 at_enable_update  (GConfClient *client,
 		   GladeXML    *dialog)
 {
@@ -179,17 +96,6 @@
 }
 
 static void
-at_startup_changed (GConfClient *client,
-		    guint        cnxn_id,
-		    GConfEntry  *entry,
-		    gpointer     user_data)
-{
-	at_startup_state_init (&at_startup_state);
-	at_startup_update_ui (client, user_data);
-	close_logout_update (user_data); 
-}
-
-static void
 at_enable_changed (GConfClient *client,
 		   guint        cnxn_id,
 		   GConfEntry  *entry,
@@ -226,36 +132,12 @@
 				 at_enable_changed,
 				 dialog, NULL, NULL);
 	
-	gconf_client_add_dir (client, AT_STARTUP_DIR, 
-			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-
-	gconf_client_add_dir (client, SR_PREFS_DIR, 
-			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-
-	gconf_client_notify_add (client, AT_STARTUP_DIR,
-				 at_startup_changed,
-				 dialog, NULL, NULL);
+	widget = WID ("at_pref_button");
 	
-	gconf_client_notify_add (client, SR_PREFS_DIR,
-				 at_startup_changed,
-				 dialog, NULL, NULL);
-	
-	widget = WID ("at_keyboard_toggle");
+	g_signal_connect (G_OBJECT (widget),
+			  "clicked",
+			  G_CALLBACK (cb_at_preferences), NULL);
 
-	g_signal_connect (widget, "toggled",
-			  G_CALLBACK (at_startup_toggled), 
-			  dialog);
-	
-	widget = WID ("at_magnifier_toggle");
-	g_signal_connect (widget, "toggled",
-			  G_CALLBACK (at_startup_toggled), 
-			  dialog);
-	
-	widget = WID ("at_screenreader_toggle");
-	g_signal_connect (widget, "toggled",
-			  G_CALLBACK (at_startup_toggled), 
-			  dialog);
-	
 	widget = WID ("at_properties_dialog");
 	capplet_set_icon (widget, "gnome-settings-accessibility-technologies");
 	
@@ -286,8 +168,6 @@
 	
 	dialog = create_dialog ();
 	
-	init_startup_state (dialog);
-	
 	setup_dialog (dialog);
 
 	gtk_main ();
