gnome-applets r10708 - trunk/accessx-status

[callum svn gnome org]

Author: callum
Date: Sun Mar  2 00:15:39 2008
New Revision: 10708
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=10708&view=rev

Log:
Use the new keyboard accesiblity program.

Modified:
   trunk/accessx-status/ChangeLog
   trunk/accessx-status/applet.c

Modified: trunk/accessx-status/applet.c
==============================================================================
--- trunk/accessx-status/applet.c	(original)
+++ trunk/accessx-status/applet.c	Sun Mar  2 00:15:39 2008
@@ -195,8 +195,19 @@
 		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 =