Patch by: Patrick Wade <patrick.wade@sun.com>

2008-03-27  Jens Granseuer  <jensgr@gmx.net>

	Patch by: Patrick Wade <patrick.wade@sun.com>

	* at-enable-dialog.glade:
	* main.c: (create_dialog), (cb_at_preferences),
	(cb_keyboard_preferences), (cb_mouse_preferences),
	(cb_login_preferences), (setup_dialog): add button to launch mouse
	accessibility properties (bug #515078)

2008-03-27  Jens Granseuer  <jensgr@gmx.net>

	Patch by: Patrick Wade <patrick.wade@sun.com>

	* gnome-mouse-properties.c: (main):
	* gnome-mouse-properties.glade: add support for starting the capplet
	on the appearance tab (required by bug #515078)

svn path=/trunk/; revision=8597

3 files changed, 48 insertions, 6 deletions

diff --git a/capplets/accessibility/at-properties/ChangeLog b/capplets/accessibility/at-properties/ChangeLog
index 0506631a3..e70674f77 100644
--- a/capplets/accessibility/at-properties/ChangeLog
+++ b/capplets/accessibility/at-properties/ChangeLog
@@ -1,3 +1,13 @@
+2008-03-27  Jens Granseuer  <jensgr@gmx.net>
+
+	Patch by: Patrick Wade <patrick.wade@sun.com>
+
+	* at-enable-dialog.glade:
+	* main.c: (create_dialog), (cb_at_preferences),
+	(cb_keyboard_preferences), (cb_mouse_preferences),
+	(cb_login_preferences), (setup_dialog): add button to launch mouse
+	accessibility properties (bug #515078)
+
 2008-02-09  Luca Ferretti  <elle.uca@libero.it>
 
 	reviewed by: Jens Granseuer
diff --git a/capplets/accessibility/at-properties/at-enable-dialog.glade b/capplets/accessibility/at-properties/at-enable-dialog.glade
index 29386e236..4035fea0e 100644
--- a/capplets/accessibility/at-properties/at-enable-dialog.glade
+++ b/capplets/accessibility/at-properties/at-enable-dialog.glade
@@ -309,6 +309,25 @@
 			      </child>
 
 			      <child>
+				<widget class="GtkButton" id="mouse_button">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="label" translatable="yes">_Mouse Accessibility</property>
+				  <property name="use_underline">True</property>
+				  <accessibility>
+				    <atkproperty name="AtkObject::accessible_description" translatable="yes">Jump to the Mouse Accessibility dialog</atkproperty>
+				  </accessibility>
+				</widget>
+				<packing>
+				  <property name="padding">5</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
 				<widget class="GtkButton" id="login_button">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
@@ -321,7 +340,7 @@
 				  </accessibility>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
+				  <property name="padding">5</property>
 				  <property name="expand">False</property>
 				  <property name="fill">False</property>
 				</packing>
diff --git a/capplets/accessibility/at-properties/main.c b/capplets/accessibility/at-properties/main.c
index 1cc9ae5bd..83394d309 100644
--- a/capplets/accessibility/at-properties/main.c
+++ b/capplets/accessibility/at-properties/main.c
@@ -32,6 +32,9 @@ create_dialog (void)
 		gtk_button_set_image (GTK_BUTTON (WID ("keyboard_button")), image);
 
 		image = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON);
+		gtk_button_set_image (GTK_BUTTON (WID ("mouse_button")), image);
+
+		image = gtk_image_new_from_stock (GTK_STOCK_JUMP_TO, GTK_ICON_SIZE_BUTTON);
 		gtk_button_set_image (GTK_BUTTON (WID ("login_button")), image);
 
 		gtk_image_set_from_file (GTK_IMAGE (WID ("at_enable_image")),
@@ -47,19 +50,25 @@ create_dialog (void)
 static void
 cb_at_preferences (GtkDialog *dialog, gint response_id)
 {
-	g_spawn_command_line_async("gnome-default-applications-properties", NULL);
+	g_spawn_command_line_async ("gnome-default-applications-properties", NULL);
 }
 
 static void
 cb_keyboard_preferences (GtkDialog *dialog, gint response_id)
 {
-	g_spawn_command_line_async("gnome-keyboard-properties --a11y", NULL);
+	g_spawn_command_line_async ("gnome-keyboard-properties --a11y", NULL);
+}
+
+static void
+cb_mouse_preferences (GtkDialog *dialog, gint response_id)
+{
+	g_spawn_command_line_async ("gnome-mouse-properties --show-page=accessibility", NULL);
 }
 
 static void
 cb_login_preferences (GtkDialog *dialog, gint response_id)
 {
-	g_spawn_command_line_async("gdmsetup", NULL);
+	g_spawn_command_line_async ("gdmsetup", NULL);
 }
 
 static void
@@ -107,8 +116,8 @@ at_enable_toggled (GtkToggleButton *toggle_button,
 }
 
 static void
-at_enable_update  (GConfClient *client,
-		   GladeXML    *dialog)
+at_enable_update (GConfClient *client,
+		  GladeXML    *dialog)
 {
 	gboolean is_enabled = gconf_client_get_bool (client, ACCESSIBILITY_KEY, NULL);
 
@@ -163,6 +172,10 @@ setup_dialog (GladeXML *dialog)
 			  "clicked",
 			  G_CALLBACK (cb_keyboard_preferences), NULL);
 
+	g_signal_connect (G_OBJECT (WID("mouse_button")),
+			  "clicked",
+			  G_CALLBACK (cb_mouse_preferences), NULL);
+
 	g_signal_connect (G_OBJECT (WID("login_button")),
 			  "clicked",
 			  G_CALLBACK (cb_login_preferences), NULL);