diff options
| author | Callum McKenzie <callum@src.gnome.org> | 2008-03-02 00:15:39 +0000 |
|---|---|---|
| committer | Callum McKenzie <callum@src.gnome.org> | 2008-03-02 00:15:39 +0000 |
| commit | 80ecd8d03433e733c7a3bc553445bb56344f6684 (patch) | |
| tree | 186f32527e58e8a3649443b07a4e59c636da7c44 /accessx-status | |
| parent | 3ca7c4eaa96fc7bfe393aeef37bff24cff9096d1 (diff) | |
Use the new keyboard accesiblity program.
svn path=/trunk/; revision=10708
Diffstat (limited to 'accessx-status')
| -rw-r--r-- | accessx-status/ChangeLog | 6 | ||||
| -rw-r--r-- | accessx-status/applet.c | 13 |
2 files changed, 18 insertions, 1 deletions
diff --git a/accessx-status/ChangeLog b/accessx-status/ChangeLog index 439b51a6b..e11c8737d 100644 --- a/accessx-status/ChangeLog +++ b/accessx-status/ChangeLog @@ -1,3 +1,9 @@ +2008-03-02 Callum McKenzie <callum@spooky-possum.org> + + * applet.c (dialog_cb): Make allowance for the disappearance of + gnome-accessibility-keyboard-properties and its movement to + gnome-keyboard-properties. (Bug #517500.) + 2008-01-08 Kjartan Maraas <kmaraas@gnome.org> * GNOME_AccessxStatusApplet.server.in.in: diff --git a/accessx-status/applet.c b/accessx-status/applet.c index efa7f2279..75f5bbeaf 100644 --- a/accessx-status/applet.c +++ b/accessx-status/applet.c @@ -195,8 +195,19 @@ dialog_cb (BonoboUIComponent *component, return; } + /* This is the old way of calling things, we try this just in case + * we're in a mixed-version enviroment. It has to be tried first, + * because the new command doesn't fail in a way useful to + * gdk_spawn_command_line_on_screen and its error parameter. */ gdk_spawn_command_line_on_screen (gtk_widget_get_screen (GTK_WIDGET (sapplet->applet)), - "gnome-accessibility-keyboard-properties", &error); + "gnome-accessibility-keyboard-properties", + &error); + + if (error != NULL) { + gdk_spawn_command_line_on_screen (gtk_widget_get_screen (GTK_WIDGET (sapplet->applet)), + "gnome-keyboard-properties --a11y", + &error); + } if (error != NULL) { GtkWidget *dialog = |