From 0e60a77a53d3adbc4256c4548ec3e31a6ec41f16 Mon Sep 17 00:00:00 2001
From: Jonathan Blandford <jrb@redhat.com>
Date: Thu, 31 Jul 2003 21:44:05 +0000
Subject: [PATCH] Add typing-break properties, #118323

Thu Jul 31 17:42:13 2003  Jonathan Blandford  <jrb@redhat.com>

        * gnome-keyboard-properties.c (main): Add typing-break properties,
        #118323
---
 capplets/keyboard/ChangeLog                       |  5 +++++
 capplets/keyboard/gnome-keyboard-properties.c     | 14 ++++++++++----
 capplets/keyboard/gnome-keyboard-properties.glade |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index d241eeb95..42f4ecc4f 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul 31 17:42:13 2003  Jonathan Blandford  <jrb@redhat.com>
+
+	* gnome-keyboard-properties.c (main): Add typing-break properties,
+	#118323
+
 2003-07-17  Dennis Cranston <dennis_cranston at yahoo com>
 
 	* gnome-keyboard-properties.glade, 
diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c
index 5b9f46402..b637a1cab 100644
--- a/capplets/keyboard/gnome-keyboard-properties.c
+++ b/capplets/keyboard/gnome-keyboard-properties.c
@@ -209,8 +209,10 @@ main (int argc, char **argv)
 	GConfChangeSet *changeset;
 	GladeXML       *dialog;
 
-	static gboolean apply_only;
-	static gboolean get_legacy;
+	static gboolean apply_only = FALSE;
+	static gboolean get_legacy = FALSE;
+	static gboolean switch_to_typing_break_page = FALSE;
+
 	static struct poptOption cap_options[] = {
 		{ "apply", '\0', POPT_ARG_NONE, &apply_only, 0,
 		  N_("Just apply settings and quit (compatibility only; now handled by daemon)"), NULL },
@@ -218,7 +220,8 @@ main (int argc, char **argv)
 		  N_("Just apply settings and quit (compatibility only; now handled by daemon)"), NULL },
 		{ "get-legacy", '\0', POPT_ARG_NONE, &get_legacy, 0,
 		  N_("Retrieve and store legacy settings"), NULL },
-//		{ "set_page",
+		{ "typing-break", '\0', POPT_ARG_NONE, &switch_to_typing_break_page, 0,
+		  N_("Start the page with the typing break settings showing"), NULL },
 		{ NULL, '\0', 0, NULL, 0, NULL, NULL }
 	};
 
@@ -243,8 +246,11 @@ main (int argc, char **argv)
 		changeset = NULL;
 		dialog = create_dialog ();
 		setup_dialog (dialog, changeset);
+		if (switch_to_typing_break_page) {
+			gtk_notebook_set_current_page (GTK_NOTEBOOK (WID ("keyboard_notebook")), 1);
+		}
 		capplet_set_icon (WID ("keyboard_dialog"),
-			"keyboard-capplet.png");
+				  "keyboard-capplet.png");
 		gtk_widget_show (WID ("keyboard_dialog"));
 		gtk_main ();
 	}
diff --git a/capplets/keyboard/gnome-keyboard-properties.glade b/capplets/keyboard/gnome-keyboard-properties.glade
index dbf69ff8a..3399758e2 100644
--- a/capplets/keyboard/gnome-keyboard-properties.glade
+++ b/capplets/keyboard/gnome-keyboard-properties.glade
@@ -126,7 +126,7 @@
       </child>
 
       <child>
-	<widget class="GtkNotebook" id="notebook1">
+	<widget class="GtkNotebook" id="keyboard_notebook">
 	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>