From d528e9f4e2a97cd304c1907db4156d05d94056a7 Mon Sep 17 00:00:00 2001 From: Denis Washington Date: Wed, 2 Jan 2008 19:03:10 +0000 Subject: [PATCH] Spawn the accessibility tab of the keyboard capplet instead of 2008-01-02 Denis Washington * accessibility/at-properties/main.c: (cb_keyboard_preferences): Spawn the accessibility tab of the keyboard capplet instead of at-properties. * capplets/keyboard/gnome-keyboard-properties.c: Add --a11y command-line option to show the Accessibility tab when started. svn path=/trunk/; revision=8365 --- capplets/accessibility/at-properties/ChangeLog | 5 +++++ capplets/accessibility/at-properties/main.c | 2 +- capplets/keyboard/ChangeLog | 5 +++++ capplets/keyboard/gnome-keyboard-properties.c | 16 +++++++++++++++- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/capplets/accessibility/at-properties/ChangeLog b/capplets/accessibility/at-properties/ChangeLog index 87d31fc97..dbdf5d312 100644 --- a/capplets/accessibility/at-properties/ChangeLog +++ b/capplets/accessibility/at-properties/ChangeLog @@ -1,3 +1,8 @@ +2008-01-02 Denis Washington + + * main.c: (cb_keyboard_preferences): Spawn the accessibility + tab of the keyboard capplet instead of at-properties. + 2007-11-26 Sebastien Bacher * main.c: (at_enable_update): enable the preferred applications button, diff --git a/capplets/accessibility/at-properties/main.c b/capplets/accessibility/at-properties/main.c index 9166a7a4c..1cc9ae5bd 100644 --- a/capplets/accessibility/at-properties/main.c +++ b/capplets/accessibility/at-properties/main.c @@ -53,7 +53,7 @@ cb_at_preferences (GtkDialog *dialog, gint response_id) static void cb_keyboard_preferences (GtkDialog *dialog, gint response_id) { - g_spawn_command_line_async("gnome-accessibility-keyboard-properties", NULL); + g_spawn_command_line_async("gnome-keyboard-properties --a11y", NULL); } static void diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog index b3b98eb8d..70a77a74b 100644 --- a/capplets/keyboard/ChangeLog +++ b/capplets/keyboard/ChangeLog @@ -1,3 +1,8 @@ +2008-01-02 Denis Washington + + * gnome-keyboard-properties.c: Add --a11y command-line option to + show the Accessibility tab when started. + 2008-01-02 Denis Washington Merge all keyboard accessibility options into the keyboard capplet. diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c index 3523e832b..1490eedc9 100644 --- a/capplets/keyboard/gnome-keyboard-properties.c +++ b/capplets/keyboard/gnome-keyboard-properties.c @@ -236,6 +236,7 @@ main (int argc, char **argv) static gboolean apply_only = FALSE; static gboolean get_legacy = FALSE; static gboolean switch_to_typing_break_page = FALSE; + static gboolean switch_to_a11y_page = FALSE; static GOptionEntry cap_options[] = { {"apply", 0, 0, G_OPTION_ARG_NONE, &apply_only, @@ -254,6 +255,11 @@ main (int argc, char **argv) N_ ("Start the page with the typing break settings showing"), NULL}, + {"a11y", 0, 0, G_OPTION_ARG_NONE, + &switch_to_a11y_page, + N_ + ("Start the page with the accessibility settings showing"), + NULL}, {NULL} }; @@ -291,8 +297,16 @@ main (int argc, char **argv) gtk_notebook_set_current_page (GTK_NOTEBOOK (WID ("keyboard_notebook")), - 3); + 4); } + else if (switch_to_a11y_page) { + gtk_notebook_set_current_page (GTK_NOTEBOOK + (WID + ("keyboard_notebook")), + 2); + + } + capplet_set_icon (WID ("keyboard_dialog"), "gnome-dev-keyboard"); gtk_widget_show (WID ("keyboard_dialog"));