Index: gnome-da-capplet.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-da-capplet.c,v
retrieving revision 1.14
diff -u -r1.14 gnome-da-capplet.c
--- gnome-da-capplet.c	16 Oct 2006 11:39:26 -0000	1.14
+++ gnome-da-capplet.c	14 Nov 2006 15:28:05 -0000
@@ -72,6 +72,9 @@
     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->sr_command_entry) {
+	gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_SR_EXEC, text, &error);
+    }
 
     if (error != NULL) {
 	g_warning (_("Error saving configuration: %s"), error->message);
@@ -105,6 +108,25 @@
 }
 
 static void
+sr_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->sr_startup_checkbutton) {
+	gconf_client_set_bool (capplet->gconf, DEFAULT_APPS_KEY_SR_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;
@@ -314,6 +336,55 @@
 }
 
 static void
+sr_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet)
+{
+    GtkTreeIter iter;
+    GtkTreePath *path;
+    guint current_index;
+    gboolean is_custom_active;
+    GnomeDASRItem *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->screen_readers)) {
+	item = (GnomeDASRItem*) g_list_nth_data (capplet->screen_readers, current_index);
+	is_custom_active = FALSE;
+
+	cs = gconf_change_set_new ();
+
+	gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_SR_EXEC, item->generic.command);
+	gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_SR_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->sr_command_entry),
+			gconf_client_get_string (capplet->gconf, DEFAULT_APPS_KEY_SR_EXEC, NULL));
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->sr_startup_checkbutton),
+				  gconf_client_get_bool (capplet->gconf, DEFAULT_APPS_KEY_SR_STARTUP, NULL));
+
+    gtk_editable_set_editable (GTK_EDITABLE (capplet->sr_command_entry), is_custom_active);
+    gtk_widget_set_sensitive (capplet->sr_command_label, is_custom_active);
+    gtk_widget_set_sensitive (capplet->sr_startup_checkbutton, is_custom_active);
+}
+
+static void
 refresh_combo_box_icons (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list)
 {
     GList *entry;
@@ -346,6 +417,7 @@
 } icons[] = {
     { "web_browser_image", "web-browser"      },
     { "mail_reader_image", "stock_mail-open"  },
+    { "screen_reader_image", "accessibility-icon" },
 /*    { "messenger_image",   "im"               },
  *    { "image_image",       "image-viewer"     },
  *    { "sound_image",       "gnome-audio"      },
@@ -368,6 +440,7 @@
     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->sr_combo_box), capplet->screen_readers);
 }
 
 static void
@@ -549,6 +622,38 @@
 }
 
 static void
+sr_update_combo_box (GnomeDACapplet *capplet, const gchar *command)
+{
+    GList *entry;
+    gint index;
+    gboolean is_custom_active;
+
+printf("GK4: sr_update_combo_box(%s)\n", command);
+    entry = g_list_find_custom (capplet->screen_readers, command, (GCompareFunc) generic_item_comp);
+
+    if (entry) {
+	index = g_list_position (capplet->screen_readers, entry);
+	is_custom_active = FALSE;
+    }
+    else {
+	/* index of 'Custom' combo box entry */
+	index = g_list_length (capplet->screen_readers) + 1;
+	is_custom_active = TRUE;
+    }
+printf("GK4: sr_update_combo_box(%s): index = %d\n", command, index);
+
+    gtk_entry_set_text (GTK_ENTRY (capplet->sr_command_entry), command);
+
+    gtk_editable_set_editable (GTK_EDITABLE (capplet->sr_command_entry), is_custom_active);
+    gtk_widget_set_sensitive (capplet->sr_command_label, is_custom_active);
+    gtk_widget_set_sensitive (capplet->sr_startup_checkbutton, is_custom_active);
+
+    if (gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->sr_combo_box)) != index)
+	gtk_combo_box_set_active (GTK_COMBO_BOX (capplet->sr_combo_box), index);
+printf("GK4: sr_update_combo_box(): END\n");
+}
+
+static void
 web_gconf_changed_cb (GConfClient *client, guint id, GConfEntry *entry, GnomeDACapplet *capplet)
 {
     GConfValue *value;
@@ -661,6 +766,27 @@
     }
 }
 
+
+static void
+sr_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_SR_EXEC) == 0) {
+	sr_update_combo_box (capplet, gconf_value_get_string (value));
+    }
+    /* TODO: Remove when GConfPropertyEditor will be used */
+    else if (strcmp (entry->key, DEFAULT_APPS_KEY_SR_STARTUP) == 0) {
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->sr_startup_checkbutton),
+				      gconf_value_get_bool (value));
+    }
+}
+
 static gboolean
 is_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer sep_index)
 {
@@ -743,11 +869,11 @@
 {
     GConfValue *value;
 
-    if (g_file_test (GLADEDIR "/gnome-default-applications-properties.glade", G_FILE_TEST_EXISTS) != FALSE) {
-	capplet->xml = glade_xml_new (GLADEDIR "/gnome-default-applications-properties.glade", NULL, NULL);
+    if (g_file_test (GLADEDIR "/gnome-default-applications-properties-gk4.glade", G_FILE_TEST_EXISTS) != FALSE) {
+	capplet->xml = glade_xml_new (GLADEDIR "/gnome-default-applications-properties-gk4.glade", NULL, NULL);
     }
     else {
-	capplet->xml = glade_xml_new ("./gnome-default-applications-properties.glade", NULL, NULL);
+	capplet->xml = glade_xml_new ("./gnome-default-applications-properties-gk4.glade", NULL, NULL);
     }
 
     if (capplet->xml == NULL) {
@@ -783,9 +909,17 @@
     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->sr_command_entry = glade_xml_get_widget (capplet->xml, "screen_reader_command_entry");
+    capplet->sr_command_label = glade_xml_get_widget (capplet->xml, "screen_reader_command_label");
+    capplet->sr_startup_checkbutton = glade_xml_get_widget (capplet->xml, "screen_reader_startup_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->sr_combo_box = glade_xml_get_widget (capplet->xml, "screen_reader_combobox");
+    if (!capplet->sr_combo_box) {
+       printf("GK4: screen_reader_combobox not found in GLADE file\n");
+    }
 
     g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet);
     screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet);
@@ -793,6 +927,7 @@
     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->sr_combo_box), capplet->screen_readers);
 
     /* update ui to gconf content */
     value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, NULL);
@@ -817,21 +952,41 @@
     gtk_entry_set_text (GTK_ENTRY (capplet->terminal_exec_flag_entry),
 			gconf_value_get_string (value));
 
+    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_SR_EXEC, NULL);
+
+    if (!value) {
+       printf("GK4: gconf %s not found\n", DEFAULT_APPS_KEY_SR_EXEC);
+    }
+
+#ifdef COMMENT
+    sr_update_combo_box (capplet, gconf_value_get_string (value));
+
+    value = gconf_client_get (capplet->gconf, DEFAULT_APPS_KEY_SR_STARTUP, NULL);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->sr_startup_checkbutton),
+				  gconf_value_get_bool (value));
+#endif
+
     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->sr_combo_box, "changed", G_CALLBACK (sr_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);
+#ifdef COMMENT
+    g_signal_connect (capplet->sr_startup_checkbutton, "toggled",
+		      G_CALLBACK (sr_checkbutton_toggled_cb), capplet);
+#endif
 
     /* 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->sr_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);
@@ -867,6 +1022,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,
@@ -876,6 +1032,9 @@
 			     capplet, NULL, NULL);
     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_SR_PATH,
+			     (GConfClientNotifyFunc) sr_gconf_changed_cb,
 			     capplet, NULL, NULL);
 
     gnome_da_xml_load_list (capplet);
Index: gnome-da-capplet.h
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-da-capplet.h,v
retrieving revision 1.3
diff -u -r1.3 gnome-da-capplet.h
--- gnome-da-capplet.h	16 Oct 2006 11:39:26 -0000	1.3
+++ gnome-da-capplet.h	14 Nov 2006 15:28:05 -0000
@@ -58,6 +58,10 @@
 #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_SR_PATH  "/desktop/gnome/accessibility/at/screen-reader"
+#define DEFAULT_APPS_KEY_SR_EXEC  DEFAULT_APPS_KEY_SR_PATH"/exec"
+#define DEFAULT_APPS_KEY_SR_STARTUP DEFAULT_APPS_KEY_SR_PATH"/startup"
+
 typedef struct _GnomeDACapplet GnomeDACapplet;
 
 struct _GnomeDACapplet {
@@ -70,6 +74,7 @@
     GtkWidget *web_combo_box;
     GtkWidget *mail_combo_box;
     GtkWidget *term_combo_box;
+    GtkWidget *sr_combo_box;
 
     GtkWidget *web_browser_command_entry;
     GtkWidget *web_browser_command_label;
@@ -87,11 +92,16 @@
     GtkWidget *terminal_exec_flag_entry;
     GtkWidget *terminal_exec_flag_label;
 
+    GtkWidget *sr_command_entry;
+    GtkWidget *sr_command_label;
+    GtkWidget *sr_startup_checkbutton;
+
     GConfClient *gconf;
 
     GList *web_browsers;
     GList *mail_readers;
     GList *terminals;
+    GList *screen_readers;
 };
 
 #endif
Index: gnome-da-item.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-da-item.c,v
retrieving revision 1.2
diff -u -r1.2 gnome-da-item.c
--- gnome-da-item.c	28 Feb 2006 21:02:55 -0000	1.2
+++ gnome-da-item.c	14 Nov 2006 15:28:06 -0000
@@ -51,6 +51,16 @@
     return item;
 }
 
+GnomeDASRItem*
+gnome_da_sr_item_new (void)
+{
+    GnomeDASRItem *item = NULL;
+
+    item = g_new0 (GnomeDASRItem, 1);
+
+    return item;
+}
+
 void
 gnome_da_web_item_free (GnomeDAWebItem *item)
 {
@@ -94,6 +104,20 @@
     g_free (item->generic.icon_path);
 
     g_free (item->exec_flag);
+
+    g_free (item);
+}
+
+void
+gnome_da_sr_item_free (GnomeDASRItem *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);
 }
Index: gnome-da-item.h
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-da-item.h,v
retrieving revision 1.2
diff -u -r1.2 gnome-da-item.h
--- gnome-da-item.h	28 Feb 2006 21:02:55 -0000	1.2
+++ gnome-da-item.h	14 Nov 2006 15:28:06 -0000
@@ -28,6 +28,7 @@
 typedef struct _GnomeDAWebItem GnomeDAWebItem;
 typedef struct _GnomeDAMailItem GnomeDAMailItem;
 typedef struct _GnomeDATermItem GnomeDATermItem;
+typedef struct _GnomeDASRItem GnomeDASRItem;
 
 struct _GnomeDAItem {
     gchar *name;
@@ -55,11 +56,17 @@
     gchar *exec_flag;
 };
 
+struct _GnomeDASRItem {
+    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);
+GnomeDASRItem* gnome_da_sr_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_sr_item_free (GnomeDASRItem *item);
 
 #endif
Index: gnome-da-xml.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-da-xml.c,v
retrieving revision 1.4
diff -u -r1.4 gnome-da-xml.c
--- gnome-da-xml.c	8 Feb 2006 16:47:49 -0000	1.4
+++ gnome-da-xml.c	14 Nov 2006 15:28:06 -0000
@@ -131,6 +131,7 @@
     GnomeDAWebItem *web_item;
     GnomeDAMailItem *mail_item;
     GnomeDATermItem *term_item;
+    GnomeDASRItem *sr_item;
 
     xml_doc = xmlParseFile (filename);
 
@@ -195,6 +196,24 @@
 			term_item->exec_flag = gnome_da_xml_get_string (element, "exec-flag");
 
 			capplet->terminals = g_list_append (capplet->terminals, term_item);
+		    }
+		}
+	    }
+	}
+	else if (!xmlStrncmp (section->name, "screen-readers", 14)) {
+	    for (element = section->children; element != NULL; element = element->next) {
+		if (!xmlStrncmp (element->name, "screen-reader", 13)) {
+		    if (is_executable_valid (gnome_da_xml_get_string (element, "executable"))) {
+			sr_item = gnome_da_sr_item_new ();
+
+			sr_item->generic.name = gnome_da_xml_get_string (element, "name");
+			sr_item->generic.executable = gnome_da_xml_get_string (element, "executable");
+			sr_item->generic.command = gnome_da_xml_get_string (element, "command");
+			sr_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name");
+
+			sr_item->run_at_startup = gnome_da_xml_get_bool (element, "run-at-startup");
+
+			capplet->screen_readers = g_list_append (capplet->screen_readers, sr_item);
 		    }
 		}
 	    }
Index: gnome-default-applications.xml.in
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-default-applications.xml.in,v
retrieving revision 1.8
diff -u -r1.8 gnome-default-applications.xml.in
--- gnome-default-applications.xml.in	9 May 2006 20:32:37 -0000	1.8
+++ gnome-default-applications.xml.in	14 Nov 2006 15:28:06 -0000
@@ -295,4 +295,28 @@
     </terminal>
   </terminals>
 
+  <screen-readers>
+    <screen-reader>
+      <_name>Orca</_name>
+      <executable>orca</executable>
+      <command>orca %s</command>
+      <icon-name>accessibility-icon</icon-name>
+      <run-at-start>false</run-at-start>
+    </screen-reader>
+    <screen-reader>
+      <_name>Linux Screen Reader</_name>
+      <executable>lsr</executable>
+      <command>lsr %s</command>
+      <icon-name>accessibility-icon</icon-name>
+      <run-at-start>false</run-at-start>
+    </screen-reader>
+    <screen-reader>
+      <_name>Gnopernicus</_name>
+      <executable>gnopernicus</executable>
+      <command>gnopernicus %s</command>
+      <icon-name>accessibility-icon</icon-name>
+      <run-at-start>false</run-at-start>
+    </screen-reader>
+  </screen-readers>
+
 </default-apps>
Index: gnome-default-applications-properties.glade
===================================================================
RCS file: /cvs/gnome/gnome-control-center/capplets/default-applications/gnome-default-applications-properties.glade,v
retrieving revision 1.20
diff -u -r1.20 gnome-default-applications-properties.glade
--- gnome-default-applications-properties.glade	28 Jan 2006 18:46:47 -0000	1.20
+++ gnome-default-applications-properties.glade	14 Nov 2006 15:28:07 -0000
@@ -1744,6 +1744,642 @@
 	      <property name="type">tab</property>
 	    </packing>
 	  </child>
+
+	  <child>
+	    <widget class="GtkVBox" id="a11y_apps_vbox">
+	      <property name="border_width">12</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">18</property>
+
+	      <child>
+		<widget class="GtkVBox" id="screen_reader_vbox">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="screen_reader_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Screen Reader&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="screen_reader_hbox">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">12</property>
+
+		      <child>
+			<widget class="GtkImage" id="screen_reader_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="screen_reader_options_vbox">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkComboBox" id="screen_reader_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="GtkTable" id="screen_reader_options_table">
+			      <property name="visible">True</property>
+			      <property name="n_rows">1</property>
+			      <property name="n_columns">3</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
+
+			      <child>
+				<widget class="GtkLabel" id="screen_reader_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="screen_reader_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>
+
+			      <child>
+				<widget class="GtkCheckButton" id="screen_reader_start_checkbutton">
+				  <property name="visible">True</property>
+				  <property name="sensitive">False</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="left_attach">2</property>
+				  <property name="right_attach">3</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>
+			    </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="mag_vbox">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="mag_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Magnifier&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="mag_hbox">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">12</property>
+
+		      <child>
+			<widget class="GtkImage" id="mag_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="mag_options_vbox">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkComboBox" id="mag_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="GtkTable" id="mag_options_table">
+			      <property name="visible">True</property>
+			      <property name="n_rows">1</property>
+			      <property name="n_columns">3</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
+
+			      <child>
+				<widget class="GtkLabel" id="mag_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="mag_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>
+
+			      <child>
+				<widget class="GtkCheckButton" id="mag_start_checkbutton">
+				  <property name="visible">True</property>
+				  <property name="sensitive">False</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="left_attach">2</property>
+				  <property name="right_attach">3</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>
+			    </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="onscreen_kbd_vbox">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">6</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="onscreen_kbd_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Onscreen Keyboard&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="oncreen_kbd_hbox">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">12</property>
+
+		      <child>
+			<widget class="GtkImage" id="onscreen_kbd_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="onscreen_kbd_options_vbox">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkComboBox" id="onscreen_keyboard_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="GtkTable" id="onscreen_kbd_options_table">
+			      <property name="visible">True</property>
+			      <property name="n_rows">1</property>
+			      <property name="n_columns">3</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
+
+			      <child>
+				<widget class="GtkLabel" id="onscreen_kbd_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">video_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="onscreen_kbd_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>
+
+			      <child>
+				<widget class="GtkCheckButton" id="onscreen_kbd_start_checkbutton">
+				  <property name="visible">True</property>
+				  <property name="sensitive">False</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="left_attach">2</property>
+				  <property name="right_attach">3</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>
+			    </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="other_at_vbox">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="other_ats_label">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Other Assistive Technologies&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="GtkComboBoxEntry" id="other_at_comboboxentry">
+		      <property name="visible">True</property>
+		      <property name="add_tearoffs">False</property>
+		      <property name="has_frame">True</property>
+		      <property name="focus_on_click">True</property>
+		    </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="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>
