diff -u --exclude-from=EXCLUDE.files gnome-control-center.orig/capplets/default-applications/ChangeLog gnome-control-center/capplets/default-applications/ChangeLog
--- gnome-control-center.orig/capplets/default-applications/ChangeLog	2007-01-12 13:46:14.000000000 -0600
+++ gnome-control-center/capplets/default-applications/ChangeLog	2007-01-12 14:24:39.000000000 -0600
@@ -1,3 +1,64 @@
+<<<<<<< ChangeLog
+2007-01-02 George Kraft IV <gk4@austin.ibm.com>
+
+	* gnome-default-applications-properties.glade: 
+	Added the Accessbility tab to the note pad per 350263.
+
+	* gnome-da-capplet.h (GnomeDACapplet): 
+	Added visual and mobility attributes.
+
+	* gnome-da-capplet.c
+	(entry_focus_out_event_cb): added gconf setup for visual and mobility
+	(visual_checkbuton_toggled_cb): new function
+	(mobility_checkbuton_toggled_cb): new function
+	(visual_combo_changed_cb): new function
+	(theme_changed_cb): added combo box refresh for visual and mobility
+	(mobility_combo_changed_cb): new function
+	(refresh_combo_box_icons): added icons for visual and mobility
+	(visual_update_combo_box): new function
+	(mobility_update_combo_box): new function
+	(show_dialog): get handle and update combo box for visual and mobility.
+	set callbacks for visual and mobility events.
+	(visual_gconf_changed_cb): new function
+	(mobility_gconf_changed_cb): new function
+	(is_separator): added visual and mobility to the Accessibility tab
+	(main): added gconf callback for visual and mobility
+
+	* gnome-da-item.h (gnome_da_visual_item_new): new prototype
+	(gnome_da_visual_item_free): new prototype
+	(gnome_da_mobility_item_new): new prototype
+	(gnome_da_mobility_item_free): new prototype
+
+	* gnome-da-item.c (gnome_da_visual_item_new): new function
+	(gnome_da_visual_item_free): new function
+	(gnome_da_mobility_item_new): new function
+	(gnome_da_mobility_item_free): new function
+
+	* gnome-da-xml.c (gnome_da_xml_load_xml):
+	Read visual and mobility XML configuration.
+
+	* gnome-default-applications.xml.in (visual-a11y): new XML attribute
+	(visual): new XML attribute
+	(mobility-a11y): new XML attribute
+	(mobility): new XML attribute
+
+	* default-applications-accessibility.desktop.in: new desktop file
+
+	* gnome-at-session.desktop.in: new autostart accessibility desktop file
+
+	* gnome-at-visual.desktop.in: new visual desktop file
+
+	* gnome-at-mobility.desktop.in: new mobility desktop file
+
+	* gnome-at-commandline.in: new wrapper script
+
+	* Makefile.am (bin_SCRIPTS): 
+	build gnome-at-visual and gnome-at-mobility
+	(Desktop_in_files): build default-applications-accessibility.desktop,
+	gnome-at-visual.desktop, gnome-at-mobility.desktop,
+	and gnome-at-session
+
+=======
 2006-12-17  Colin Leroy  <colin@colino.net>
 
 	* gnome-default-applications.xml.in: add support for Claws Mail (aka
@@ -20,6 +81,7 @@
 	Fix a bunch of leaks from gconf_client_get_string()
 	Bug #376949.	
 
+>>>>>>> 1.132
 2006-10-09  Luca Cavalli  <lcavalli@cvs.gnome.org>
 
 	* gnome-da-capplet.c: (web_gconf_changed_cb):
Common subdirectories: gnome-control-center.orig/capplets/default-applications/.deps and gnome-control-center/capplets/default-applications/.deps
diff -u --exclude-from=EXCLUDE.files gnome-control-center.orig/capplets/default-applications/gnome-da-capplet.c gnome-control-center/capplets/default-applications/gnome-da-capplet.c
--- gnome-control-center.orig/capplets/default-applications/gnome-da-capplet.c	2007-01-12 13:46:14.000000000 -0600
+++ gnome-control-center/capplets/default-applications/gnome-da-capplet.c	2007-01-12 14:08:48.000000000 -0600
@@ -72,6 +72,12 @@
     else if (widget == capplet->terminal_exec_flag_entry) {
 	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG, text, &error);
     }
+    else if (widget == capplet->visual_command_entry) {
+	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_EXEC, text, &error);
+    }
+    else if (widget == capplet->mobility_command_entry) {
+	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_EXEC, text, &error);
+    }
 
     if (error != NULL) {
 	g_warning (_("Error saving configuration: %s"), error->message);
@@ -105,6 +111,45 @@
 }
 
 static void
+visual_checkbutton_toggled_cb (GtkToggleButton *togglebutton, GnomeDACapplet *capplet)
+{
+    gboolean is_active;
+    GError *error = NULL;
+
+    is_active = gtk_toggle_button_get_active (togglebutton);
+
+    if (GTK_WIDGET (togglebutton) == capplet->visual_startup_checkbutton) {
+	gconf_client_set_bool (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_STARTUP, is_active, &error);
+    }
+
+    if (error != NULL) {
+	g_warning (_("Error saving configuration: %s"), error->message);
+	g_error_free (error);
+	error = NULL;
+    }
+}
+
+static void
+mobility_checkbutton_toggled_cb (GtkToggleButton *togglebutton, GnomeDACapplet *capplet)
+{
+    gboolean is_active;
+    GError *error = NULL;
+
+    is_active = gtk_toggle_button_get_active (togglebutton);
+
+    if (GTK_WIDGET (togglebutton) == capplet->mobility_startup_checkbutton) {
+	gconf_client_set_bool (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_STARTUP, is_active, &error);
+    }
+
+    if (error != NULL) {
+	g_warning (_("Error saving configuration: %s"), error->message);
+	g_error_free (error);
+	error = NULL;
+    }
+}
+
+
+static void
 set_icon (GtkImage *image, GtkIconTheme *theme, const char *name)
 {
     GdkPixbuf *pixbuf;
@@ -320,6 +365,103 @@
 }
 
 static void
+visual_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
+{
+    GtkTreeIter iter;
+    GtkTreePath *path;
+    guint current_index;
+    gboolean is_custom_active;
+    GnomeDAVisualItem *item;
+    GConfChangeSet *cs;
+    GError *error = NULL;
+
+    gtk_combo_box_get_active_iter (combo, &iter);
+    path = gtk_tree_model_get_path (gtk_combo_box_get_model (combo), &iter);
+    current_index = gtk_tree_path_get_indices (path)[0];
+    gtk_tree_path_free (path);
+
+    if (current_index < g_list_length (capplet->visual_ats)) {
+	item = (GnomeDAVisualItem*) g_list_nth_data (capplet->visual_ats, current_index);
+	is_custom_active = FALSE;
+
+	cs = gconf_change_set_new ();
+
+	gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_VISUAL_EXEC, item->generic.command);
+	gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_VISUAL_STARTUP, item->run_at_startup);
+
+	gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
+
+	if (error != NULL) {
+	    g_warning (_("Error saving configuration: %s"), error->message);
+	    g_error_free (error);
+	    error = NULL;
+	}
+
+	gconf_change_set_unref (cs);
+    }
+    else {
+	is_custom_active = TRUE;
+    }
+
+    gtk_entry_set_text (GTK_ENTRY (capplet->visual_command_entry),
+			gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_EXEC, NULL));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->visual_startup_checkbutton),
+				  gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_STARTUP, NULL));
+
+    gtk_editable_set_editable (GTK_EDITABLE (capplet->visual_command_entry), is_custom_active);
+    gtk_widget_set_sensitive (capplet->visual_command_label, is_custom_active);
+
+}
+
+static void
+mobility_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
+{
+    GtkTreeIter iter;
+    GtkTreePath *path;
+    guint current_index;
+    gboolean is_custom_active;
+    GnomeDAMobilityItem *item;
+    GConfChangeSet *cs;
+    GError *error = NULL;
+
+    gtk_combo_box_get_active_iter (combo, &iter);
+    path = gtk_tree_model_get_path (gtk_combo_box_get_model (combo), &iter);
+    current_index = gtk_tree_path_get_indices (path)[0];
+    gtk_tree_path_free (path);
+
+    if (current_index < g_list_length (capplet->mobility_ats)) {
+	item = (GnomeDAMobilityItem*) g_list_nth_data (capplet->mobility_ats, current_index);
+	is_custom_active = FALSE;
+
+	cs = gconf_change_set_new ();
+
+	gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_MOBILITY_EXEC, item->generic.command);
+	gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_MOBILITY_STARTUP, item->run_at_startup);
+
+	gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error);
+
+	if (error != NULL) {
+	    g_warning (_("Error saving configuration: %s"), error->message);
+	    g_error_free (error);
+	    error = NULL;
+	}
+
+	gconf_change_set_unref (cs);
+    }
+    else {
+	is_custom_active = TRUE;
+    }
+
+    gtk_entry_set_text (GTK_ENTRY (capplet->mobility_command_entry),
+			gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_EXEC, NULL));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->mobility_startup_checkbutton),
+				  gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_STARTUP, NULL));
+
+    gtk_editable_set_editable (GTK_EDITABLE (capplet->mobility_command_entry), is_custom_active);
+    gtk_widget_set_sensitive (capplet->mobility_command_label, is_custom_active);
+}
+
+static void
 refresh_combo_box_icons (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list)
 {
     GList *entry;
@@ -352,6 +494,8 @@
 } icons[] = {
     { "web_browser_image", "web-browser"      },
     { "mail_reader_image", "stock_mail-open"  },
+    { "visual_image",      "gnome-searchtool" },
+    { "mobility_image",    "icon-accessibility" },
 /*    { "messenger_image",   "im"               },
  *    { "image_image",       "image-viewer"     },
  *    { "sound_image",       "gnome-audio"      },
@@ -374,6 +518,8 @@
     refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers);
     refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers);
     refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals);
+    refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats);
+    refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats);
 }
 
 static void
@@ -555,6 +701,63 @@
 }
 
 static void
+visual_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
+{
+    GList *entry;
+    gint index;
+    gboolean is_custom_active;
+
+    entry = g_list_find_custom (capplet->visual_ats, command, (GCompareFunc) generic_item_comp);
+
+    if (entry) {
+	index = g_list_position (capplet->visual_ats, entry);
+	is_custom_active = FALSE;
+    }
+    else {
+	/* index of 'Custom' combo box entry */
+	index = g_list_length (capplet->visual_ats) + 1;
+	is_custom_active = TRUE;
+    }
+
+    gtk_entry_set_text (GTK_ENTRY (capplet->visual_command_entry), command);
+
+    gtk_editable_set_editable (GTK_EDITABLE (capplet->visual_command_entry), is_custom_active);
+    gtk_widget_set_sensitive (capplet->visual_command_label, is_custom_active);
+
+    if (gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->visual_combo_box)) != index)
+	gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->visual_combo_box), index);
+}
+
+
+static void
+mobility_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
+{
+    GList *entry;
+    gint index;
+    gboolean is_custom_active;
+
+    entry = g_list_find_custom (capplet->mobility_ats, command, (GCompareFunc) generic_item_comp);
+
+    if (entry) {
+	index = g_list_position (capplet->mobility_ats, entry);
+	is_custom_active = FALSE;
+    }
+    else {
+	/* index of 'Custom' combo box entry */
+	index = g_list_length (capplet->mobility_ats) + 1;
+	is_custom_active = TRUE;
+    }
+
+    gtk_entry_set_text (GTK_ENTRY (capplet->mobility_command_entry), command);
+
+    gtk_editable_set_editable (GTK_EDITABLE (capplet->mobility_command_entry), is_custom_active);
+    gtk_widget_set_sensitive (capplet->mobility_command_label, is_custom_active);
+
+    if (gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->mobility_combo_box)) != index)
+	gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->mobility_combo_box), index);
+}
+
+static void
 web_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
 {
     GConfValue *value;
@@ -667,6 +870,47 @@
     }
 }
 
+
+static void
+visual_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
+{
+    GConfValue *value;
+
+    g_return_if_fail (gconf_entry_get_key (entry) != NULL);
+
+    if (!(value = gconf_entry_get_value (entry)))
+	return;
+
+    if (strcmp (entry->key, DEFAULT_APPS_KEY_VISUAL_EXEC) == 0) {
+	visual_update_combo_box (capplet, gconf_value_get_string (value));
+    }
+    /* TODO: Remove when GConfPropertyEditor will be used */
+    else if (strcmp (entry->key, DEFAULT_APPS_KEY_VISUAL_STARTUP) == 0) {
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->visual_startup_checkbutton),
+				      gconf_value_get_bool (value));
+    }
+}
+
+static void
+mobility_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
+{
+    GConfValue *value;
+
+    g_return_if_fail (gconf_entry_get_key (entry) != NULL);
+
+    if (!(value = gconf_entry_get_value (entry)))
+	return;
+
+    if (strcmp (entry->key, DEFAULT_APPS_KEY_MOBILITY_EXEC) == 0) {
+	mobility_update_combo_box (capplet, gconf_value_get_string (value));
+    }
+    /* TODO: Remove when GConfPropertyEditor will be used */
+    else if (strcmp (entry->key, DEFAULT_APPS_KEY_MOBILITY_STARTUP) == 0) {
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->mobility_startup_checkbutton),
+				      gconf_value_get_bool (value));
+    }
+}
+
 static gboolean
 is_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer sep_index)
 {
@@ -786,9 +1030,19 @@
     capplet->terminal_exec_flag_entry = glade_xml_get_widget (capplet->xml, "terminal_exec_flag_entry");
     capplet->terminal_exec_flag_label = glade_xml_get_widget (capplet->xml, "terminal_exec_flag_label");
 
+    capplet->visual_command_entry = glade_xml_get_widget (capplet->xml, "visual_command_entry");
+    capplet->visual_command_label = glade_xml_get_widget (capplet->xml, "visual_command_label");
+    capplet->visual_startup_checkbutton = glade_xml_get_widget (capplet->xml, "visual_start_checkbutton");
+
+    capplet->mobility_command_entry = glade_xml_get_widget (capplet->xml, "mobility_command_entry");
+    capplet->mobility_command_label = glade_xml_get_widget (capplet->xml, "mobility_command_label");
+    capplet->mobility_startup_checkbutton = glade_xml_get_widget (capplet->xml, "mobility_start_checkbutton");
+
     capplet->web_combo_box = glade_xml_get_widget (capplet->xml, "web_browser_combobox");
     capplet->mail_combo_box = glade_xml_get_widget (capplet->xml, "mail_reader_combobox");
     capplet->term_combo_box = glade_xml_get_widget (capplet->xml, "terminal_combobox");
+    capplet->visual_combo_box = glade_xml_get_widget (capplet->xml, "visual_combobox");
+    capplet->mobility_combo_box = glade_xml_get_widget (capplet->xml, "mobility_combobox");
 
     g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet);
     screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet);
@@ -796,6 +1050,8 @@
     fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers);
     fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers);
     fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals);
+    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats);
+    fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats);
 
     /* update ui to gconf content */
     value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, NULL);
@@ -844,21 +1100,60 @@
 	gconf_value_free (value);
     }
 
+    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_EXEC, NULL);
+
+    if (value)
+    {
+        visual_update_combo_box (capplet, gconf_value_get_string (value));
+    }
+
+    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_STARTUP, NULL);
+    if (value)
+    {
+        gtk_toggle_button_set_active (
+            GTK_TOGGLE_BUTTON (capplet->visual_startup_checkbutton),
+            gconf_value_get_bool (value));
+    }
+
+    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_EXEC, NULL);
+
+    if (value)
+    {
+        mobility_update_combo_box (capplet, gconf_value_get_string (value));
+    }
+
+    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_STARTUP, NULL);
+
+    if (value)
+    {
+        gtk_toggle_button_set_active (
+            GTK_TOGGLE_BUTTON (capplet->mobility_startup_checkbutton),
+            gconf_value_get_bool (value));
+    }
+
     g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet);
     g_signal_connect (capplet->mail_combo_box, "changed", G_CALLBACK (mail_combo_changed_cb), capplet);
     g_signal_connect (capplet->term_combo_box, "changed", G_CALLBACK (terminal_combo_changed_cb), capplet);
+    g_signal_connect (capplet->visual_combo_box, "changed", G_CALLBACK (visual_combo_changed_cb), capplet);
+    g_signal_connect (capplet->mobility_combo_box, "changed", G_CALLBACK (mobility_combo_changed_cb), capplet);
 
     /* TODO: Remove when GConfPropertyEditor will be used */
     g_signal_connect (capplet->web_browser_terminal_checkbutton, "toggled",
 		      G_CALLBACK (terminal_checkbutton_toggled_cb), capplet);
     g_signal_connect (capplet->mail_reader_terminal_checkbutton, "toggled",
 		      G_CALLBACK (terminal_checkbutton_toggled_cb), capplet);
+    g_signal_connect (capplet->visual_startup_checkbutton, "toggled",
+		      G_CALLBACK (visual_checkbutton_toggled_cb), capplet);
+    g_signal_connect (capplet->mobility_startup_checkbutton, "toggled",
+		      G_CALLBACK (mobility_checkbutton_toggled_cb), capplet);
 
     /* TODO: Remove when GConfPropertyEditor will be used */
     g_signal_connect (capplet->web_browser_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
     g_signal_connect (capplet->mail_reader_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
     g_signal_connect (capplet->terminal_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
     g_signal_connect (capplet->terminal_exec_flag_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
+    g_signal_connect (capplet->visual_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
+    g_signal_connect (capplet->mobility_command_entry, "focus-out-event", G_CALLBACK (entry_focus_out_event_cb), capplet);
 
     g_signal_connect (capplet->default_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet);
     g_signal_connect (capplet->new_win_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet);
@@ -894,6 +1189,7 @@
     gconf_client_add_dir (capplet->gconf, "/desktop/gnome/applications/browser", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
     gconf_client_add_dir (capplet->gconf, "/desktop/gnome/applications/terminal", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
     gconf_client_add_dir (capplet->gconf, "/desktop/gnome/url-handlers", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+    gconf_client_add_dir (capplet->gconf, "/desktop/gnome/accessibility/at", GCONF_CLIENT_PRELOAD_RECURSIVE, NULL);
 
     gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_HTTP_PATH,
 			     (GConfClientNotifyFunc) web_gconf_changed_cb,
@@ -904,6 +1200,12 @@
     gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_TERMINAL_PATH,
 			     (GConfClientNotifyFunc) term_gconf_changed_cb,
 			     capplet, NULL, NULL);
+    gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_VISUAL_PATH,
+			     (GConfClientNotifyFunc) visual_gconf_changed_cb,
+			     capplet, NULL, NULL);
+    gconf_client_notify_add (capplet->gconf, DEFAULT_APPS_KEY_MOBILITY_PATH,
+			     (GConfClientNotifyFunc) mobility_gconf_changed_cb,
+			     capplet, NULL, NULL);
 
     gnome_da_xml_load_list (capplet);
 
diff -u --exclude-from=EXCLUDE.files gnome-control-center.orig/capplets/default-applications/gnome-da-capplet.h gnome-control-center/capplets/default-applications/gnome-da-capplet.h
--- gnome-control-center.orig/capplets/default-applications/gnome-da-capplet.h	2007-01-12 13:46:14.000000000 -0600
+++ gnome-control-center/capplets/default-applications/gnome-da-capplet.h	2007-01-12 14:08:48.000000000 -0600
@@ -58,6 +58,14 @@
 #define DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG DEFAULT_APPS_KEY_TERMINAL_PATH"/exec_arg"
 #define DEFAULT_APPS_KEY_TERMINAL_EXEC     DEFAULT_APPS_KEY_TERMINAL_PATH"/exec"
 
+#define DEFAULT_APPS_KEY_VISUAL_PATH  "/desktop/gnome/applications/at/visual"
+#define DEFAULT_APPS_KEY_VISUAL_EXEC  DEFAULT_APPS_KEY_VISUAL_PATH"/exec"
+#define DEFAULT_APPS_KEY_VISUAL_STARTUP DEFAULT_APPS_KEY_VISUAL_PATH"/startup"
+
+#define DEFAULT_APPS_KEY_MOBILITY_PATH  "/desktop/gnome/applications/at/mobility"
+#define DEFAULT_APPS_KEY_MOBILITY_EXEC  DEFAULT_APPS_KEY_MOBILITY_PATH"/exec"
+#define DEFAULT_APPS_KEY_MOBILITY_STARTUP DEFAULT_APPS_KEY_MOBILITY_PATH"/startup"
+
 typedef struct _GnomeDACapplet GnomeDACapplet;
 
 struct _GnomeDACapplet {
@@ -70,6 +78,8 @@
     GtkWidget *web_combo_box;
     GtkWidget *mail_combo_box;
     GtkWidget *term_combo_box;
+    GtkWidget *visual_combo_box;
+    GtkWidget *mobility_combo_box;
 
     GtkWidget *web_browser_command_entry;
     GtkWidget *web_browser_command_label;
@@ -87,11 +97,21 @@
     GtkWidget *terminal_exec_flag_entry;
     GtkWidget *terminal_exec_flag_label;
 
+    GtkWidget *visual_command_entry;
+    GtkWidget *visual_command_label;
+    GtkWidget *visual_startup_checkbutton;
+
+    GtkWidget *mobility_command_entry;
+    GtkWidget *mobility_command_label;
+    GtkWidget *mobility_startup_checkbutton;
+
     GConfClient *gconf;
 
     GList *web_browsers;
     GList *mail_readers;
     GList *terminals;
+    GList *visual_ats;
+    GList *mobility_ats;
 };
 
 #endif
Binary files gnome-control-center.orig/capplets/default-applications/gnome-da-capplet.o and gnome-control-center/capplets/default-applications/gnome-da-capplet.o differ
diff -u --exclude-from=EXCLUDE.files gnome-control-center.orig/capplets/default-applications/gnome-da-item.c gnome-control-center/capplets/default-applications/gnome-da-item.c
--- gnome-control-center.orig/capplets/default-applications/gnome-da-item.c	2007-01-12 13:46:14.000000000 -0600
+++ gnome-control-center/capplets/default-applications/gnome-da-item.c	2007-01-12 14:08:48.000000000 -0600
@@ -51,6 +51,26 @@
     return item;
 }
 
+GnomeDAVisualItem*
+gnome_da_visual_item_new (void)
+{
+    GnomeDAVisualItem *item = NULL;
+
+    item = g_new0 (GnomeDAVisualItem, 1);
+
+    return item;
+}
+
+GnomeDAMobilityItem*
+gnome_da_mobility_item_new (void)
+{
+    GnomeDAMobilityItem *item = NULL;
+
+    item = g_new0 (GnomeDAMobilityItem, 1);
+
+    return item;
+}
+
 void
 gnome_da_web_item_free (GnomeDAWebItem *item)
 {
@@ -97,3 +117,32 @@
 
     g_free (item);
 }
+
+void
+gnome_da_visual_item_free (GnomeDAVisualItem *item)
+{
+    g_return_if_fail (item != NULL);
+
+    g_free (item->generic.name);
+    g_free (item->generic.executable);
+    g_free (item->generic.command);
+    g_free (item->generic.icon_name);
+    g_free (item->generic.icon_path);
+
+    g_free (item);
+}
+
+void
+gnome_da_mobility_item_free (GnomeDAMobilityItem *item)
+{
+    g_return_if_fail (item != NULL);
+
+    g_free (item->generic.name);
+    g_free (item->generic.executable);
+    g_free (item->generic.command);
+    g_free (item->generic.icon_name);
+    g_free (item->generic.icon_path);
+
+    g_free (item);
+}
+
diff -u --exclude-from=EXCLUDE.files gnome-control-center.orig/capplets/default-applications/gnome-da-item.h gnome-control-center/capplets/default-applications/gnome-da-item.h
--- gnome-control-center.orig/capplets/default-applications/gnome-da-item.h	2007-01-12 13:46:14.000000000 -0600
+++ gnome-control-center/capplets/default-applications/gnome-da-item.h	2007-01-12 14:08:48.000000000 -0600
@@ -28,6 +28,8 @@
 typedef struct _GnomeDAWebItem GnomeDAWebItem;
 typedef struct _GnomeDAMailItem GnomeDAMailItem;
 typedef struct _GnomeDATermItem GnomeDATermItem;
+typedef struct _GnomeDAVisualItem GnomeDAVisualItem;
+typedef struct _GnomeDAMobilityItem GnomeDAMobilityItem;
 
 struct _GnomeDAItem {
     gchar *name;
@@ -55,11 +57,25 @@
     gchar *exec_flag;
 };
 
+struct _GnomeDAVisualItem {
+    GnomeDAItem generic;
+    gboolean run_at_startup;
+};
+
+struct _GnomeDAMobilityItem {
+    GnomeDAItem generic;
+    gboolean run_at_startup;
+};
+
 GnomeDAWebItem* gnome_da_web_item_new (void);
 GnomeDAMailItem* gnome_da_mail_item_new (void);
 GnomeDATermItem* gnome_da_term_item_new (void);
+GnomeDAVisualItem* gnome_da_visual_item_new (void);
+GnomeDAMobilityItem* gnome_da_mobility_item_new (void);
 void gnome_da_web_item_free (GnomeDAWebItem *item);
 void gnome_da_mail_item_free (GnomeDAMailItem *item);
 void gnome_da_term_item_free (GnomeDATermItem *item);
+void gnome_da_visual_item_free (GnomeDAVisualItem *item);
+void gnome_da_mobility_item_free (GnomeDAMobilityItem *item);
 
 #endif
Binary files gnome-control-center.orig/capplets/default-applications/gnome-da-item.o and gnome-control-center/capplets/default-applications/gnome-da-item.o differ
diff -u --exclude-from=EXCLUDE.files gnome-control-center.orig/capplets/default-applications/gnome-da-xml.c gnome-control-center/capplets/default-applications/gnome-da-xml.c
--- gnome-control-center.orig/capplets/default-applications/gnome-da-xml.c	2007-01-12 13:46:14.000000000 -0600
+++ gnome-control-center/capplets/default-applications/gnome-da-xml.c	2007-01-12 14:13:08.000000000 -0600
@@ -132,6 +132,8 @@
     GnomeDAWebItem *web_item;
     GnomeDAMailItem *mail_item;
     GnomeDATermItem *term_item;
+    GnomeDAVisualItem *visual_item;
+    GnomeDAMobilityItem *mobility_item;
 
     xml_doc = xmlParseFile (filename);
 
@@ -209,6 +211,48 @@
 		}
 	    }
 	}
+	else if (!xmlStrncmp (section->name, "a11y-visual", 11)) {
+	    for (element = section->children; element != NULL; element = element->next) {
+		if (!xmlStrncmp (element->name, "visual", 6)) {
+		    executable = gnome_da_xml_get_string (element,"executable");
+		    if (is_executable_valid (executable)) {
+			visual_item = gnome_da_visual_item_new ();
+
+			visual_item->generic.name = gnome_da_xml_get_string (element, "name");
+			visual_item->generic.executable = executable;
+			visual_item->generic.command = gnome_da_xml_get_string (element, "command");
+			visual_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name");
+
+			visual_item->run_at_startup = gnome_da_xml_get_bool (element, "run-at-startup");
+
+			capplet->visual_ats = g_list_append (capplet->visual_ats, visual_item);
+		    } 
+                    else
+                        g_free (executable);
+		}
+	    }
+	}
+	else if (!xmlStrncmp (section->name, "a11y-mobility", 13)) {
+	    for (element = section->children; element != NULL; element = element->next) {
+		if (!xmlStrncmp (element->name, "mobility", 8)) {
+		    executable = gnome_da_xml_get_string (element,"executable");
+		    if (is_executable_valid (executable)) {
+			mobility_item = gnome_da_mobility_item_new ();
+
+			mobility_item->generic.name = gnome_da_xml_get_string (element, "name");
+			mobility_item->generic.executable = executable;
+			mobility_item->generic.command = gnome_da_xml_get_string (element, "command");
+			mobility_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name");
+
+			mobility_item->run_at_startup = gnome_da_xml_get_bool (element, "run-at-startup");
+
+			capplet->mobility_ats = g_list_append (capplet->mobility_ats, mobility_item);
+		    }
+                    else
+                        g_free (executable);
+		}
+	    }
+	}
     }
 
     xmlFreeDoc (xml_doc);
@@ -242,6 +286,8 @@
     g_list_free (capplet->web_browsers);
     g_list_free (capplet->mail_readers);
     g_list_free (capplet->terminals);
+    g_list_free (capplet->visual_ats);
+    g_list_free (capplet->mobility_ats);
 
     g_object_unref (capplet->xml);
     g_free (capplet);
Binary files gnome-control-center.orig/capplets/default-applications/gnome-da-xml.o and gnome-control-center/capplets/default-applications/gnome-da-xml.o differ
diff -u --exclude-from=EXCLUDE.files gnome-control-center.orig/capplets/default-applications/gnome-default-applications-properties.glade gnome-control-center/capplets/default-applications/gnome-default-applications-properties.glade
--- gnome-control-center.orig/capplets/default-applications/gnome-default-applications-properties.glade	2007-01-12 13:46:14.000000000 -0600
+++ gnome-control-center/capplets/default-applications/gnome-default-applications-properties.glade	2007-01-12 14:08:48.000000000 -0600
@@ -1744,6 +1744,400 @@
 	      <property name="type">tab</property>
 	    </packing>
 	  </child>
+
+	  <child>
+	    <widget class="GtkVBox" id="a11y_apps_vbox">
+	      <property name="border_width">12</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">18</property>
+
+	      <child>
+		<widget class="GtkVBox" id="visual_vbox">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="visual_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Visual&lt;/b&gt;</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</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="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>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkHBox" id="visual_hbox">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">12</property>
+
+		      <child>
+			<widget class="GtkImage" id="visual_image">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkVBox" id="visual_options_vbox">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkComboBox" id="visual_combobox">
+			      <property name="visible">True</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="visual_start_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Run at st_art</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>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkTable" id="visual_options_table">
+			      <property name="visible">True</property>
+			      <property name="n_rows">1</property>
+			      <property name="n_columns">2</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
+
+			      <child>
+				<widget class="GtkLabel" id="visual_command_label">
+				  <property name="visible">True</property>
+				  <property name="sensitive">False</property>
+				  <property name="label" translatable="yes">Co_mmand:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</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="mnemonic_widget">image_command_entry</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="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkEntry" id="visual_command_entry">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">All %s occurrences will be replaced with actual link</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">False</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkVBox" id="mobility_vbox">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="mobility_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Mobility&lt;/b&gt;</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</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="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>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkHBox" id="mobility_hbox">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">12</property>
+
+		      <child>
+			<widget class="GtkImage" id="mobility_image">
+			  <property name="visible">True</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkVBox" id="mobility_options_vbox">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkComboBox" id="mobility_combobox">
+			      <property name="visible">True</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="mobility_start_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Run at st_art</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>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkTable" id="mobility_options_table">
+			      <property name="visible">True</property>
+			      <property name="n_rows">1</property>
+			      <property name="n_columns">2</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
+
+			      <child>
+				<widget class="GtkLabel" id="mobility_command_label">
+				  <property name="visible">True</property>
+				  <property name="sensitive">False</property>
+				  <property name="label" translatable="yes">Co_mmand:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</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="mnemonic_widget">sound_command_entry</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="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkEntry" id="mobility_command_entry">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">All %s occurrences will be replaced with actual link</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">False</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="a11y_apps_label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Accessibility</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <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="type">tab</property>
+	    </packing>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
diff -u --exclude-from=EXCLUDE.files gnome-control-center.orig/capplets/default-applications/gnome-default-applications.xml.in gnome-control-center/capplets/default-applications/gnome-default-applications.xml.in
--- gnome-control-center.orig/capplets/default-applications/gnome-default-applications.xml.in	2007-01-12 13:46:14.000000000 -0600
+++ gnome-control-center/capplets/default-applications/gnome-default-applications.xml.in	2007-01-12 14:08:48.000000000 -0600
@@ -319,4 +319,88 @@
     </terminal>
   </terminals>
 
+  <a11y-visual>
+    <visual>
+      <_name>Orca</_name>
+      <executable>orca</executable>
+      <command>orca</command>
+      <icon-name>orca</icon-name>
+      <run-at-start>false</run-at-start>
+    </visual>
+    <visual>
+      <_name>Orca with Magnifier</_name>
+      <executable>orca</executable>
+      <command>orca -m</command>
+      <icon-name>orca</icon-name>
+      <run-at-start>false</run-at-start>
+    </visual>
+    <visual>
+      <_name>Linux Screen Reader</_name>
+      <executable>lsr</executable>
+      <command>lsr</command>
+      <icon-name>lsr</icon-name>
+      <run-at-start>false</run-at-start>
+    </visual>
+    <visual>
+      <_name>Linux Screen Reader with Magnifier</_name>
+      <executable>lsr</executable>
+      <command>lsr -p mag</command>
+      <icon-name>lsr</icon-name>
+      <run-at-start>false</run-at-start>
+    </visual>
+    <visual>
+      <_name>Gnopernicus</_name>
+      <executable>gnopernicus</executable>
+      <command>gnopernicus</command>
+      <icon-name>icon-accessibility</icon-name>
+      <run-at-start>false</run-at-start>
+    </visual>
+    <visual>
+      <_name>Gnopernicus with Magnifier</_name>
+      <executable>gnopernicus</executable>
+      <command>gnopernicus -m</command>
+      <icon-name>icon-accessibility</icon-name>
+      <run-at-start>false</run-at-start>
+    </visual>
+    <visual>
+      <_name>GNOME Magnifier without Screen Reader</_name>
+      <executable>magnifier</executable>
+      <command>magnifier -m</command>
+      <icon-name>gnome-searchtool</icon-name>
+      <run-at-start>false</run-at-start>
+    </visual>
+    <visual>
+      <_name>KDE Magnifier without Screen Reader</_name>
+      <executable>kmag</executable>
+      <command>kmag</command>
+      <icon-name>gnome-searchtool</icon-name>
+      <run-at-start>false</run-at-start>
+    </visual>
+
+  </a11y-visual>
+
+  <a11y-mobility>
+    <mobility>
+      <_name>GNOME OnScreen Keyboard</_name>
+      <executable>gok</executable>
+      <command>gok</command>
+      <icon-name>accessibility-keyboard-capplet</icon-name>
+      <run-at-start>false</run-at-start>
+    </mobility>
+    <mobility>
+      <_name>Simple OnScreen Keyboard</_name>
+      <executable>sok</executable>
+      <command>sok</command>
+      <icon-name>accessibility-keyboard-capplet</icon-name>
+      <run-at-start>false</run-at-start>
+    </mobility>
+    <mobility>
+      <_name>Dasher</_name>
+      <executable>dasher</executable>
+      <command>dasher</command>
+      <icon-name>gnome-searchtool</icon-name>
+      <run-at-start>false</run-at-start>
+    </mobility>
+  </a11y-mobility>
+
 </default-apps>
Common subdirectories: gnome-control-center.orig/capplets/default-applications/.libs and gnome-control-center/capplets/default-applications/.libs
diff -u --exclude-from=EXCLUDE.files gnome-control-center.orig/capplets/default-applications/Makefile.am gnome-control-center/capplets/default-applications/Makefile.am
--- gnome-control-center.orig/capplets/default-applications/Makefile.am	2007-01-12 13:46:14.000000000 -0600
+++ gnome-control-center/capplets/default-applications/Makefile.am	2007-01-12 14:08:48.000000000 -0600
@@ -1,5 +1,7 @@
 bin_PROGRAMS = gnome-default-applications-properties
 
+bin_SCRIPTS = gnome-at-visual gnome-at-mobility
+
 gnome_default_applications_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS)
 gnome_default_applications_properties_SOURCES = \
 	gnome-da-capplet.c gnome-da-capplet.h \
@@ -11,10 +13,22 @@
 gladedir   = $(GNOMECC_GLADE_DIR)
 glade_DATA = gnome-default-applications-properties.glade
 
+gnome-at-visual: gnome-at-commandline.in
+	cp $< $@
+
+gnome-at-mobility: gnome-at-commandline.in
+	cp $< $@
+
 desktopdir = $(datadir)/applications
-Desktop_in_files = default-applications.desktop.in
+Desktop_in_files = default-applications.desktop.in \
+	default-applications-accessibility.desktop.in \
+	gnome-at-visual.desktop.in gnome-at-mobility.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
+autostartdir = $(datadir)/gnome/autostart
+autostart_in_files = gnome-at-session.desktop.in
+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
+
 xmldata_in_files = gnome-default-applications.xml.in
 xmldatadir = $(datadir)/gnome-default-applications
 xmldata_DATA = $(xmldata_in_files:.xml.in=.xml)
@@ -27,5 +41,6 @@
 	-DDATADIR=\""$(datadir)"\"
 
 noinst_DATA = gnome-default-applications.xml.in
-CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xmldata_DATA)
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xmldata_DATA) $(autostart_DATA)
 EXTRA_DIST = $(glade_DATA) gnome-default-applications.xml.in
+
diff -u --exclude-from=EXCLUDE.files gnome-control-center.orig/capplets/default-applications/Makefile.in gnome-control-center/capplets/default-applications/Makefile.in
--- gnome-control-center.orig/capplets/default-applications/Makefile.in	2007-01-12 13:46:14.000000000 -0600
+++ gnome-control-center/capplets/default-applications/Makefile.in	2007-01-12 14:10:45.000000000 -0600
@@ -15,6 +15,7 @@
 @SET_MAKE@
 
 
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -49,7 +50,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = default-applications.desktop.in
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)" \
 	"$(DESTDIR)$(gladedir)" "$(DESTDIR)$(xmldatadir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
@@ -61,6 +63,8 @@
 am__DEPENDENCIES_1 =
 gnome_default_applications_properties_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1)
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(bin_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -80,10 +84,12 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+autostartDATA_INSTALL = $(INSTALL_DATA)
 desktopDATA_INSTALL = $(INSTALL_DATA)
 gladeDATA_INSTALL = $(INSTALL_DATA)
 xmldataDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(desktop_DATA) $(glade_DATA) $(noinst_DATA) $(xmldata_DATA)
+DATA = $(autostart_DATA) $(desktop_DATA) $(glade_DATA) $(noinst_DATA) \
+	$(xmldata_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -361,6 +367,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+bin_SCRIPTS = gnome-at-visual gnome-at-mobility
 gnome_default_applications_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS)
 gnome_default_applications_properties_SOURCES = \
 	gnome-da-capplet.c gnome-da-capplet.h \
@@ -370,8 +377,14 @@
 gladedir = $(GNOMECC_GLADE_DIR)
 glade_DATA = gnome-default-applications-properties.glade
 desktopdir = $(datadir)/applications
-Desktop_in_files = default-applications.desktop.in
+Desktop_in_files = default-applications.desktop.in \
+	default-applications-accessibility.desktop.in \
+	gnome-at-visual.desktop.in gnome-at-mobility.desktop.in
+
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
+autostartdir = $(datadir)/gnome/autostart
+autostart_in_files = gnome-at-session.desktop.in
+autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 xmldata_in_files = gnome-default-applications.xml.in
 xmldatadir = $(datadir)/gnome-default-applications
 xmldata_DATA = $(xmldata_in_files:.xml.in=.xml)
@@ -382,7 +395,7 @@
 	-DDATADIR=\""$(datadir)"\"
 
 noinst_DATA = gnome-default-applications.xml.in
-CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xmldata_DATA)
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xmldata_DATA) $(autostart_DATA)
 EXTRA_DIST = $(glade_DATA) gnome-default-applications.xml.in
 all: all-am
 
@@ -450,6 +463,25 @@
 gnome-default-applications-properties$(EXEEXT): $(gnome_default_applications_properties_OBJECTS) $(gnome_default_applications_properties_DEPENDENCIES) 
 	@rm -f gnome-default-applications-properties$(EXEEXT)
 	$(LINK) $(gnome_default_applications_properties_LDFLAGS) $(gnome_default_applications_properties_OBJECTS) $(gnome_default_applications_properties_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -491,6 +523,23 @@
 distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
+install-autostartDATA: $(autostart_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(autostartdir)" || $(mkdir_p) "$(DESTDIR)$(autostartdir)"
+	@list='$(autostart_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(autostartDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(autostartdir)/$$f'"; \
+	  $(autostartDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(autostartdir)/$$f"; \
+	done
+
+uninstall-autostartDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(autostart_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(autostartdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(autostartdir)/$$f"; \
+	done
 install-desktopDATA: $(desktop_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
@@ -620,9 +669,9 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA)
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(xmldatadir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(autostartdir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(xmldatadir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -670,10 +719,10 @@
 
 info-am:
 
-install-data-am: install-desktopDATA install-gladeDATA \
-	install-xmldataDATA
+install-data-am: install-autostartDATA install-desktopDATA \
+	install-gladeDATA install-xmldataDATA
 
-install-exec-am: install-binPROGRAMS
+install-exec-am: install-binPROGRAMS install-binSCRIPTS
 
 install-info: install-info-am
 
@@ -699,25 +748,34 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
-	uninstall-gladeDATA uninstall-info-am uninstall-xmldataDATA
+uninstall-am: uninstall-autostartDATA uninstall-binPROGRAMS \
+	uninstall-binSCRIPTS uninstall-desktopDATA uninstall-gladeDATA \
+	uninstall-info-am uninstall-xmldataDATA
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am \
-	install-desktopDATA install-exec install-exec-am \
-	install-gladeDATA install-info install-info-am install-man \
-	install-strip install-xmldataDATA installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-desktopDATA \
-	uninstall-gladeDATA uninstall-info-am uninstall-xmldataDATA
+	install-autostartDATA install-binPROGRAMS install-binSCRIPTS \
+	install-data install-data-am install-desktopDATA install-exec \
+	install-exec-am install-gladeDATA install-info install-info-am \
+	install-man install-strip install-xmldataDATA installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-autostartDATA \
+	uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-desktopDATA uninstall-gladeDATA uninstall-info-am \
+	uninstall-xmldataDATA
 
 
 @INTLTOOL_DESKTOP_RULE@
+
+gnome-at-visual: gnome-at-commandline.in
+	cp $< $@
+
+gnome-at-mobility: gnome-at-commandline.in
+	cp $< $@
 @INTLTOOL_XML_RULE@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
Common subdirectories: gnome-control-center.orig/capplets/default-applications/.svn and gnome-control-center/capplets/default-applications/.svn
--- /dev/null	2007-01-11 14:12:10.283633388 -0600
+++ gnome-control-center/capplets/default-applications/default-applications-accessibility.desktop.in	2007-01-12 14:08:48.000000000 -0600
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Preferred Assistive Technology
+_Comment=Enable support for GNOME assistive technologies at login
+Exec=gnome-default-applications-properties
+Icon=gnome-settings-accessibility-technologies
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Settings;Accessibility;
+OnlyShowIn=GNOME;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=control-center
+X-GNOME-Bugzilla-Component=other capplets
+X-GNOME-Bugzilla-Version=@VERSION@
--- /dev/null	2007-01-11 14:12:10.283633388 -0600
+++ gnome-control-center/capplets/default-applications/gnome-at-visual.desktop.in	2007-01-12 14:08:48.000000000 -0600
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Visual AT
+_Comment=Run the the preferred GNOME Visual Assistive Technology
+Exec=gnome-at-visual
+Icon=gnome-searchtool
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Settings;Accessibility;
+OnlyShowIn=GNOME;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=control-center
+X-GNOME-Bugzilla-Component=other capplets
+X-GNOME-Bugzilla-Version=@VERSION@
--- /dev/null	2007-01-11 14:12:10.283633388 -0600
+++ gnome-control-center/capplets/default-applications/gnome-at-mobility.desktop.in	2007-01-12 14:08:48.000000000 -0600
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Mobility AT
+_Comment=Run the the preferred GNOME Mobility Assitive Technology
+Exec=gnome-at-mobility
+Icon=icon-accessibility
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=GNOME;GTK;Settings;Accessibility;
+OnlyShowIn=GNOME;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=control-center
+X-GNOME-Bugzilla-Component=other capplets
+X-GNOME-Bugzilla-Version=@VERSION@
--- /dev/null	2007-01-11 14:12:10.283633388 -0600
+++ gnome-control-center/capplets/default-applications/gnome-at-session.desktop.in	2007-01-12 14:08:48.000000000 -0600
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Visual
+_Comment=Autostart the preferred AT
+Exec=gnome-at-visual -s
+Icon=gnome-searchtool
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=
+OnlyShowIn=GNOME;
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=control-center
+X-GNOME-Bugzilla-Component=other capplets
+X-GNOME-Bugzilla-Version=@VERSION@
+X-GNOME-Autostart-enabled=true
--- /dev/null	2007-01-11 14:12:10.283633388 -0600
+++ gnome-control-center/capplets/default-applications/gnome-at-commandline.in	2007-01-12 14:08:48.000000000 -0600
@@ -0,0 +1,102 @@
+#!/bin/sh
+#
+#  Copyright 2006 IBM Corp.
+#
+#  This program is free software; you can redistribute it and/or modify
+#  it under the terms of version 2 of the GNU General Public License
+#  as published by the Free Software Foundation
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+#
+###############################################################################
+#
+#  NOTE: This script is intended to be run from the command line, 
+#  GNOME menu, or from the desktop autostart.
+#
+#  /usr/bin/gnome-at-visual
+#  /usr/bin/gnome-at-mobility
+#
+#  If the "-s" flag is used then it is assumed to have been invoked
+#  from /usr/share/gnome/autostart/, and the first AT flagged
+#  to "startup" from GCONF_ALL will be executed.
+#
+
+USAGE="$0 [-s]"
+GCONF_PATH=/desktop/gnome/applications/at
+GCONF_VISUAL="visual"
+GCONF_MOBILITY="mobility"
+GCONF_ALL="$GCONF_VISUAL $GCONF_MOBILITY"
+
+run_at() {
+	CMDLINE=$(gconftool-2 --get $GCONF_PATH/$1/exec)
+	if [ $? -ne 0 ]; then
+		exit $?
+	fi
+	
+	if [ -z "$CMDLINE" ]; then
+		exit 2
+	fi
+	
+	STARTUP=$(gconftool-2 --get $GCONF_PATH/$1/startup)
+	if [ $? -ne 0 ]; then
+		exit $?
+	fi
+	
+	if [ ! -z "$AUTOSTART" ]; then
+		# assuming ran from /usr/share/gnome/autostart
+		if [ "$STARTUP" == "true" ]; then
+			# gconf indicated requested autostart
+			($CMDLINE &)
+		fi
+	else
+		# run from command line or desktop menu
+		($CMDLINE &)
+	fi
+}
+
+case $(basename $0) in
+	gnome-at-visual )
+		AT=$GCONF_VISUAL
+		;;
+	gnome-at-mobility )
+		AT=$GCONF_MOBILITY
+		;;
+	gnome-at-session | * )
+		AUTOSTART="yes"
+		AT=$GCONF_ALL
+		;;
+esac
+
+while getopts "s" options; do
+	case $options in
+		s )	AUTOSTART="yes"
+			AT=$GCONF_ALL
+			shift
+			;;
+		\? )	echo $USAGE
+			exit 1
+			;;
+		* )	echo $USAGE
+			exit 1
+			;;
+	esac
+done
+
+if [ $# -ne 0 ]; then
+	echo $USAGE
+	exit 1
+fi
+
+for I in $AT ; do
+	run_at $I
+done
+
+#EOF
+
