[gnome-control-center] Remove typing break



commit 712a72c30195f9d9e3ce1b36870c264ffb30156f
Author: William Jon McCann <jmccann redhat com>
Date:   Sat Oct 9 02:55:21 2010 -0400

    Remove typing break

 Makefile.am                                        |    4 -
 configure.ac                                       |   45 -
 .../keyboard/gnome-keyboard-properties-dialog.ui   |  246 +-----
 panels/keyboard/gnome-keyboard-properties.c        |   37 -
 typing-break/Makefile.am                           |   58 --
 typing-break/bar-disabled.png                      |  Bin 496 -> 0 bytes
 typing-break/bar-green.png                         |  Bin 286 -> 0 bytes
 typing-break/bar-red.png                           |  Bin 277 -> 0 bytes
 typing-break/bar.png                               |  Bin 362 -> 0 bytes
 typing-break/drw-break-window.c                    |  587 -------------
 typing-break/drw-break-window.h                    |   55 --
 typing-break/drw-monitor.c                         |  196 -----
 typing-break/drw-monitor.h                         |   51 --
 typing-break/drw-selection.c                       |  190 ----
 typing-break/drw-selection.h                       |   33 -
 typing-break/drw-timer.c                           |   52 --
 typing-break/drw-timer.h                           |   42 -
 typing-break/drw-utils.c                           |  224 -----
 typing-break/drw-utils.h                           |   29 -
 typing-break/drwright.c                            |  903 --------------------
 typing-break/drwright.h                            |   30 -
 typing-break/main.c                                |  125 ---
 typing-break/ocean-stripes.png                     |  Bin 274 -> 0 bytes
 typing-break/stock_stop.png                        |  Bin 1451 -> 0 bytes
 typing-break/typing-monitor.png                    |  Bin 3292 -> 0 bytes
 typing-break/typing-monitor.svg                    |  336 --------
 26 files changed, 28 insertions(+), 3215 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 9c4d411..b9975cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,10 +4,6 @@ SUBDIRS = po libgnome-control-center shell panels \
 	  help docs
 DIST_SUBDIRS = po help shell typing-break docs examples panels libgnome-control-center
 
-if HAVE_TYPING_BREAK
-SUBDIRS += typing-break
-endif
-
 if BUILD_EXAMPLES
 SUBDIRS += examples
 endif
diff --git a/configure.ac b/configure.ac
index b359d89..1474817 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,22 +48,6 @@ GNOME_MAINTAINER_MODE_DEFINES
 AC_PATH_XTRA
 x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
 
-AC_CHECK_FUNC(XScreenSaverQueryInfo, [
-  TYPING_BREAK="typing-break"], [
-  save_LIBS=$LIBS
-  LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"
-  AC_CHECK_LIB(Xss, XScreenSaverQueryInfo, [
-    TYPING_BREAK="typing-break"
-    SCREENSAVER_LIBS="$X_PRE_LIBS $X_LIBS -lXss -lXext -lX11"], [
-    LIBS=$save_LIBS
-    LIBS="$LIBS $X_PRE_LIBS $X_LIBS -lXext -lX11"
-    AC_CHECK_LIB(Xext, XScreenSaverQueryInfo, [
-      TYPING_BREAK="typing-break"
-      SCREENSAVER_LIBS="$X_PRE_LIBS $X_LIBS -lXext -lX11"],[])])
-  LIBS=$save_LIBS])
-AC_SUBST(TYPING_BREAK)
-AC_SUBST(SCREENSAVER_LIBS)
-
 PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk3, [
   CANBERRA_GTK=1
   AC_SUBST(LIBCANBERRA_GTK_CFLAGS)
@@ -71,33 +55,6 @@ PKG_CHECK_MODULES(LIBCANBERRA_GTK, libcanberra-gtk3, [
   ], [:])
 AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1")
 
-AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break)
-
-dnl app indicator
-APPINDICATOR_REQUIRED=0.0.7
-
-AC_ARG_ENABLE(appindicator,
-                        AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]),
-                        [enable_appindicator=$enableval],
-                        [enable_appindicator="auto"])
-
-if test x$enable_appindicator = xauto ; then
-        PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],
-                         enable_appindicator="yes",
-                         enable_appindicator="no")
-fi
-
-if test x$enable_appindicator = xyes ; then
-        PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],,
-                         AC_MSG_ERROR([appindicator-0.1 is not installed]))
-        PKG_CHECK_MODULES(APP_INDICATOR,
-                        appindicator-0.1 >= $APPINDICATOR_REQUIRED)
-        AC_SUBST(APP_INDICATOR_CFLAGS)
-        AC_SUBST(APP_INDICATOR_LIBS)
-        AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator])
-fi
-AM_CONDITIONAL(HAVE_APP_INDICATOR, test x"$enable_appindicator" = xyes)
-
 dnl keyboard-properties-capplet
 savecppflags=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
@@ -129,7 +86,6 @@ PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnome-menu gio-unix-2.0)
 PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
 PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0)
 PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
-PKG_CHECK_MODULES(TYPING, glib-2.0 > 2.11 gconf-2.0 gtk+-3.0)
 PKG_CHECK_MODULES(GSD_DBUS, gnome-settings-daemon)
 PKG_CHECK_MODULES(GIO, gio-2.0)
 PKG_CHECK_MODULES(XML, libxml-2.0)
@@ -373,7 +329,6 @@ panels/universal-access/gnome-universal-access-panel.desktop.in
 po/Makefile.in
 shell/Makefile
 shell/gnome-control-center.desktop.in
-typing-break/Makefile
 ])
 
 dnl due to a bug in intltool we need to expand something from the root last control-center.spec
diff --git a/panels/keyboard/gnome-keyboard-properties-dialog.ui b/panels/keyboard/gnome-keyboard-properties-dialog.ui
index e16ab64..910da07 100644
--- a/panels/keyboard/gnome-keyboard-properties-dialog.ui
+++ b/panels/keyboard/gnome-keyboard-properties-dialog.ui
@@ -75,16 +75,17 @@
     <property name="default_width">450</property>
     <property name="default_height">430</property>
     <property name="type_hint">dialog</property>
-    <property name="has_separator">False</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkVBox" id="vbox1">
             <property name="visible">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="border_width">5</property>
+            <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
               <object class="GtkNotebook" id="keyboard_notebook">
@@ -94,10 +95,12 @@
                   <object class="GtkVBox" id="vbox2">
                     <property name="visible">True</property>
                     <property name="border_width">12</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">18</property>
                     <child>
                       <object class="GtkVBox" id="vbox22">
                         <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label1">
@@ -131,6 +134,7 @@
                             <child>
                               <object class="GtkVBox" id="vbox3">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkCheckButton" id="repeat_toggle">
@@ -154,6 +158,7 @@
                                     <child>
                                       <object class="GtkVBox" id="vbox24">
                                         <property name="visible">True</property>
+                                        <property name="orientation">vertical</property>
                                         <property name="spacing">6</property>
                                         <child>
                                           <object class="GtkLabel" id="repeat_delay_label">
@@ -191,6 +196,7 @@
                                     <child>
                                       <object class="GtkVBox" id="vbox25">
                                         <property name="visible">True</property>
+                                        <property name="orientation">vertical</property>
                                         <property name="spacing">6</property>
                                         <child>
                                           <object class="GtkLabel" id="delay_short_label">
@@ -232,6 +238,7 @@
                                     <child>
                                       <object class="GtkVBox" id="vbox26">
                                         <property name="visible">True</property>
+                                        <property name="orientation">vertical</property>
                                         <property name="spacing">6</property>
                                         <child>
                                           <object class="GtkHScale" id="repeat_delay_scale">
@@ -268,6 +275,7 @@
                                     <child>
                                       <object class="GtkVBox" id="vbox27">
                                         <property name="visible">True</property>
+                                        <property name="orientation">vertical</property>
                                         <property name="spacing">6</property>
                                         <child>
                                           <object class="GtkLabel" id="delay_long_label">
@@ -329,6 +337,7 @@
                     <child>
                       <object class="GtkVBox" id="vbox23">
                         <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label5">
@@ -362,6 +371,7 @@
                             <child>
                               <object class="GtkVBox" id="cursor_vbox">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkCheckButton" id="cursor_toggle">
@@ -493,10 +503,12 @@
                   <object class="GtkVBox" id="vbox33">
                     <property name="visible">True</property>
                     <property name="border_width">12</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkVBox" id="vbox34">
                         <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow1">
@@ -526,6 +538,7 @@
                             <child>
                               <object class="GtkVBox" id="vbox4">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <property name="homogeneous">True</property>
                                 <child>
@@ -562,6 +575,7 @@
                             <child>
                               <object class="GtkVBox" id="vbox5">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <property name="homogeneous">True</property>
                                 <child>
@@ -598,6 +612,7 @@
                             <child>
                               <object class="GtkVBox" id="vbox6">
                                 <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <property name="homogeneous">True</property>
                                 <child>
@@ -768,11 +783,13 @@ default settings</property>
                   <object class="GtkVBox" id="vbox77">
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="border_width">12</property>
+                    <property name="orientation">vertical</property>
                     <property name="spacing">18</property>
                     <child>
                       <object class="GtkVBox" id="vbox78">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkHBox" id="hbox39">
@@ -782,6 +799,7 @@ default settings</property>
                               <object class="GtkVBox" id="vbox79">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkCheckButton" id="master_enable">
@@ -818,6 +836,7 @@ default settings</property>
                       <object class="GtkVBox" id="vbox80">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label73">
@@ -852,6 +871,7 @@ default settings</property>
                               <object class="GtkVBox" id="vbox81">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkCheckButton" id="stickykeys_enable">
@@ -901,6 +921,7 @@ default settings</property>
                       <object class="GtkVBox" id="vbox82">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label75">
@@ -935,6 +956,7 @@ default settings</property>
                               <object class="GtkVBox" id="vbox83">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkCheckButton" id="slowkeys_enable">
@@ -1054,6 +1076,7 @@ default settings</property>
                       <object class="GtkVBox" id="vbox84">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label77">
@@ -1088,6 +1111,7 @@ default settings</property>
                               <object class="GtkVBox" id="vbox85">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkCheckButton" id="bouncekeys_enable">
@@ -1248,10 +1272,12 @@ default settings</property>
                   <object class="GtkVBox" id="vbox89">
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="border_width">12</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkVBox" id="vbox90">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                        <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkCheckButton" id="mousekeys_enable">
@@ -1286,6 +1312,7 @@ default settings</property>
                               <object class="GtkVBox" id="vbox91">
                                 <property name="visible">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="orientation">vertical</property>
                                 <property name="spacing">6</property>
                                 <child>
                                   <object class="GtkTable" id="mousekeys_table">
@@ -1542,223 +1569,6 @@ default settings</property>
                     <property name="tab_fill">False</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkVBox" id="vbox14">
-                    <property name="visible">True</property>
-                    <property name="spacing">12</property>
-                    <child>
-                      <object class="GtkVBox" id="vbox18">
-                        <property name="visible">True</property>
-                        <property name="border_width">12</property>
-                        <property name="spacing">18</property>
-                        <child>
-                          <object class="GtkVBox" id="vbox28">
-                            <property name="visible">True</property>
-                            <property name="spacing">6</property>
-                            <child>
-                              <object class="GtkCheckButton" id="break_enabled_toggle">
-                                <property name="label" translatable="yes">_Lock screen to enforce typing break</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">Lock screen after a certain duration to help prevent repetitive keyboard use injuries</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkHBox" id="hbox26">
-                                <property name="visible">True</property>
-                                <child>
-                                  <object class="GtkLabel" id="label45">
-                                    <property name="visible">True</property>
-                                    <property name="label">    </property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkVBox" id="break_details_table">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkHBox" id="hbox27">
-                                        <property name="visible">True</property>
-                                        <property name="spacing">12</property>
-                                        <child>
-                                          <object class="GtkVBox" id="vbox30">
-                                            <property name="visible">True</property>
-                                            <property name="spacing">6</property>
-                                            <child>
-                                              <object class="GtkLabel" id="label37">
-                                                <property name="visible">True</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">_Work interval lasts:</property>
-                                                <property name="use_underline">True</property>
-                                                <property name="mnemonic_widget">break_enabled_spin</property>
-                                              </object>
-                                              <packing>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkLabel" id="label30">
-                                                <property name="visible">True</property>
-                                                <property name="xalign">0</property>
-                                                <property name="label" translatable="yes">_Break interval lasts:</property>
-                                                <property name="use_underline">True</property>
-                                                <property name="mnemonic_widget">break_interval_spin</property>
-                                              </object>
-                                              <packing>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkHBox" id="hbox28">
-                                            <property name="visible">True</property>
-                                            <property name="spacing">6</property>
-                                            <child>
-                                              <object class="GtkVBox" id="vbox31">
-                                                <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkSpinButton" id="break_enabled_spin">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="tooltip_text" translatable="yes">Duration of work before forcing a break</property>
-                                                    <property name="adjustment">adjustment9</property>
-                                                    <property name="climb_rate">1</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkSpinButton" id="break_interval_spin">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">True</property>
-                                                    <property name="tooltip_text" translatable="yes">Duration of the break when typing is disallowed</property>
-                                                    <property name="adjustment">adjustment10</property>
-                                                    <property name="climb_rate">1</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkVBox" id="vbox32">
-                                                <property name="visible">True</property>
-                                                <property name="spacing">6</property>
-                                                <child>
-                                                  <object class="GtkLabel" id="label39">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">minutes</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="position">0</property>
-                                                  </packing>
-                                                </child>
-                                                <child>
-                                                  <object class="GtkLabel" id="label31">
-                                                    <property name="visible">True</property>
-                                                    <property name="xalign">0</property>
-                                                    <property name="label" translatable="yes">minutes</property>
-                                                  </object>
-                                                  <packing>
-                                                    <property name="position">1</property>
-                                                  </packing>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">False</property>
-                                            <property name="position">1</property>
-                                          </packing>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="break_postponement_toggle">
-                                        <property name="label" translatable="yes">All_ow postponing of breaks</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip_text" translatable="yes">Check if breaks are allowed to be postponed</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">4</property>
-                  </packing>
-                </child>
-                <child type="tab">
-                  <object class="GtkLabel" id="label20">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Typing Break</property>
-                  </object>
-                  <packing>
-                    <property name="position">4</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="position">0</property>
diff --git a/panels/keyboard/gnome-keyboard-properties.c b/panels/keyboard/gnome-keyboard-properties.c
index aaca592..920a5b8 100644
--- a/panels/keyboard/gnome-keyboard-properties.c
+++ b/panels/keyboard/gnome-keyboard-properties.c
@@ -148,43 +148,6 @@ setup_dialog (GtkBuilder * dialog, GConfChangeSet * changeset)
 					 "conv-from-widget-cb",
 					 blink_from_widget, NULL);
 
-	/* Ergonomics */
-	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);
-
-	} 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);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]