gnome-control-center r8589 - trunk/capplets/keyboard
- From: jensg svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-control-center r8589 - trunk/capplets/keyboard
- Date: Mon, 24 Mar 2008 17:48:01 +0000 (GMT)
Author: jensg
Date: Mon Mar 24 17:48:00 2008
New Revision: 8589
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8589&view=rev
Log:
2008-03-24 Jens Granseuer <jensgr gmx net>
* gnome-keyboard-properties.c: (setup_dialog): don't show the typing
break tab if the typing monitor is not available (bug #524034)
Modified:
trunk/capplets/keyboard/ChangeLog
trunk/capplets/keyboard/gnome-keyboard-properties.c
Modified: trunk/capplets/keyboard/gnome-keyboard-properties.c
==============================================================================
--- trunk/capplets/keyboard/gnome-keyboard-properties.c (original)
+++ trunk/capplets/keyboard/gnome-keyboard-properties.c Mon Mar 24 17:48:00 2008
@@ -130,6 +130,7 @@
setup_dialog (GladeXML * dialog, GConfChangeSet * changeset)
{
GObject *peditor;
+ gchar *monitor;
peditor = gconf_peditor_new_boolean
(changeset, "/desktop/gnome/peripherals/keyboard/repeat",
@@ -159,28 +160,39 @@
blink_from_widget, NULL);
/* Ergonomics */
- peditor = gconf_peditor_new_boolean
- (changeset, "/desktop/gnome/typing_break/enabled",
- WID ("break_enabled_toggle"), NULL);
- gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor),
- WID ("break_details_table"));
- gconf_peditor_new_numeric_range (changeset,
- "/desktop/gnome/typing_break/type_time",
- WID ("break_enabled_spin"), NULL);
- gconf_peditor_new_numeric_range (changeset,
- "/desktop/gnome/typing_break/break_time",
- WID ("break_interval_spin"),
- NULL);
- gconf_peditor_new_boolean (changeset,
- "/desktop/gnome/typing_break/allow_postpone",
- WID ("break_postponement_toggle"),
- NULL);
- g_signal_connect (G_OBJECT (WID ("keyboard_dialog")), "response",
- (GCallback) dialog_response, changeset);
+ monitor = g_find_program_in_path ("gnome-typing-monitor");
+ if (monitor != NULL) {
+ g_free (monitor);
+
+ peditor = gconf_peditor_new_boolean
+ (changeset, "/desktop/gnome/typing_break/enabled",
+ WID ("break_enabled_toggle"), NULL);
+ gconf_peditor_widget_set_guard (GCONF_PROPERTY_EDITOR (peditor),
+ WID ("break_details_table"));
+ gconf_peditor_new_numeric_range (changeset,
+ "/desktop/gnome/typing_break/type_time",
+ WID ("break_enabled_spin"), NULL);
+ gconf_peditor_new_numeric_range (changeset,
+ "/desktop/gnome/typing_break/break_time",
+ WID ("break_interval_spin"),
+ NULL);
+ gconf_peditor_new_boolean (changeset,
+ "/desktop/gnome/typing_break/allow_postpone",
+ WID ("break_postponement_toggle"),
+ NULL);
- gtk_label_set_use_markup (GTK_LABEL
- (GTK_BIN (WID ("break_enabled_toggle"))->
- child), TRUE);
+ gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (WID ("break_enabled_toggle"))->child),
+ TRUE);
+
+ } else {
+ /* don't show the typing break tab if the daemon is not available */
+ GtkNotebook *nb = GTK_NOTEBOOK (WID ("keyboard_notebook"));
+ gint tb_page = gtk_notebook_page_num (nb, WID ("break_enabled_toggle"));
+ gtk_notebook_remove_page (nb, tb_page);
+ }
+
+ g_signal_connect (WID ("keyboard_dialog"), "response",
+ (GCallback) dialog_response, changeset);
setup_xkb_tabs (dialog, changeset);
setup_a11y_tabs (dialog, changeset);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]