[mousetweaks] Remove "animate-cursor" option

[Gerd Kohlberger <gerdk src gnome org>]

commit 8f8a2205805b5c53bc1b23a0fcf78f3b15b51834
Author: Gerd Kohlberger <gerdk src gnome org>
Date:   Tue Oct 26 19:04:11 2010 +0200

    Remove "animate-cursor" option
    
    This was mainly used for debugging and is no longer required.

 data/org.gnome.mousetweaks.gschema.xml.in |    5 -----
 man/mousetweaks.1                         |    6 +-----
 src/mt-common.h                           |    1 -
 src/mt-main.c                             |   11 +----------
 src/mt-settings.c                         |   16 +---------------
 src/mt-settings.h                         |    1 -
 6 files changed, 3 insertions(+), 37 deletions(-)
---
diff --git a/data/org.gnome.mousetweaks.gschema.xml.in b/data/org.gnome.mousetweaks.gschema.xml.in
index 21a0b4c..ff93020 100644
--- a/data/org.gnome.mousetweaks.gschema.xml.in
+++ b/data/org.gnome.mousetweaks.gschema.xml.in
@@ -5,10 +5,5 @@
       <_summary>Click type window style</_summary>
       <_description>Button style in the click type window. ("0" = Text, "1" = Icon, "2" = Both)</_description>
     </key>
-    <key name="animate-cursor" type="b">
-      <default>true</default>
-      <_summary>Animate cursor</_summary>
-      <_description>Show elapsed time as a cursor overlay.</_description>
-    </key>
   </schema>
 </schemalist>
diff --git a/man/mousetweaks.1 b/man/mousetweaks.1
index 855f058..4cda45b 100644
--- a/man/mousetweaks.1
+++ b/man/mousetweaks.1
@@ -8,7 +8,7 @@ mousetweaks \- Accessibility enhancements for pointing devices
 [\-m|\-\-dwell\-mode=STRING] [\-c|\-\-show\-ctw]
 [\-x|\-\-ctw\-x=INT] [\-y|\-\-ctw\-y=INT]
 [\-t|\-\-threshold=INT] [\-s|\-\-shutdown]
-[\-\-disable\-animations] [\-\-daemonize] [\-?|\-\-help]
+[\-\-daemonize] [\-?|\-\-help]
 .SH DESCRIPTION
 .B mousetweaks
 is a collection of accessibility enhancements for pointing devices. This
@@ -52,10 +52,6 @@ Ignore small pointer movements. Range: 0 \- 30 pixels.
 .B \-s, \-\-shutdown
 Stop the mousetweaks daemon.
 .TP
-.B \-\-disable-animation
-Disable cursor animations. The animation shows the timer progress
-for dwell clicks and secondary clicks as cursor overlay.
-.TP
 .B \-\-daemonize
 Start mousetweaks in the background, ie. spawn a child process.
 .TP
diff --git a/src/mt-common.h b/src/mt-common.h
index 1d475fa..8175606 100644
--- a/src/mt-common.h
+++ b/src/mt-common.h
@@ -40,7 +40,6 @@ G_BEGIN_DECLS
 /* GSettings */
 #define MOUSETWEAKS_SCHEMA_ID       "org.gnome.mousetweaks"
 #define KEY_CTW_STYLE               "click-type-window-style"
-#define KEY_ANIMATE_CURSOR          "animate-cursor"
 
 #define A11Y_MOUSE_SCHEMA_ID        "org.gnome.desktop.a11y.mouse"
 #define KEY_DWELL_ENABLED           "dwell-click-enabled"
diff --git a/src/mt-main.c b/src/mt-main.c
index 864d566..044de83 100644
--- a/src/mt-main.c
+++ b/src/mt-main.c
@@ -57,7 +57,6 @@ typedef struct _MtCliArgs
     gboolean shutdown;
     gboolean daemonize;
     gboolean ctw;
-    gboolean no_animation;
     gboolean login;
 } MtCliArgs;
 
@@ -508,10 +507,7 @@ mt_main_timer_tick (MtTimer *timer,
                     gdouble  time,
                     MtData  *mt)
 {
-    MtSettings *ms;
-
-    ms = mt_settings_get_default ();
-    if (ms->animate_cursor && mt->cursor)
+    if (mt->cursor)
     {
         mt_main_update_cursor (mt, timer, time);
     }
@@ -622,8 +618,6 @@ mt_parse_options (int *argc, char ***argv)
             N_("Ignore small pointer movements"), "[0-30]"},
         {"shutdown", 's', 0, G_OPTION_ARG_NONE, &ca.shutdown,
             N_("Shut down mousetweaks"), 0},
-        {"disable-animation", 0, 0, G_OPTION_ARG_NONE, &ca.no_animation,
-            N_("Disable cursor animations"), 0},
         {"daemonize", 0, 0, G_OPTION_ARG_NONE, &ca.daemonize,
             N_("Start mousetweaks as a daemon"), 0},
         {"login", 0, 0, G_OPTION_ARG_NONE, &ca.login,
@@ -643,7 +637,6 @@ mt_parse_options (int *argc, char ***argv)
     ca.shutdown      = FALSE;
     ca.daemonize     = FALSE;
     ca.ctw           = FALSE;
-    ca.no_animation  = FALSE;
     ca.login         = FALSE;
 
     /* parse */
@@ -722,8 +715,6 @@ mt_main (int argc, char **argv, MtCliArgs cli_args)
         ms->dwell_threshold = cli_args.threshold;
     if (cli_args.ctw)
         ms->ctw_visible = cli_args.ctw;
-    if (cli_args.no_animation)
-        ms->animate_cursor = !cli_args.no_animation;
     if (cli_args.mode)
     {
         if (g_str_equal (cli_args.mode, "gesture"))
diff --git a/src/mt-settings.c b/src/mt-settings.c
index 73c947b..65a2500 100644
--- a/src/mt-settings.c
+++ b/src/mt-settings.c
@@ -36,8 +36,7 @@ enum
     PROP_DWELL_GESTURE_SECONDARY,
     PROP_SSC_ENABLED,
     PROP_CTW_VISIBLE,
-    PROP_CTW_STYLE,
-    PROP_ANIMATE_CURSOR,
+    PROP_CTW_STYLE
 };
 
 G_DEFINE_TYPE (MtSettings, mt_settings, G_TYPE_OBJECT)
@@ -48,7 +47,6 @@ mt_settings_init (MtSettings *ms)
     ms->mt_settings = g_settings_new (MOUSETWEAKS_SCHEMA_ID);
 
     BIND_PROP (ms->mt_settings, "ctw-style", KEY_CTW_STYLE);
-    BIND_PROP (ms->mt_settings, "animate-cursor", KEY_ANIMATE_CURSOR);
 
     ms->a11y_settings = g_settings_new (A11Y_MOUSE_SCHEMA_ID);
 
@@ -123,9 +121,6 @@ mt_settings_set_property (GObject      *object,
         case PROP_CTW_STYLE:
             ms->ctw_style = g_value_get_int (value);
             break;
-        case PROP_ANIMATE_CURSOR:
-            ms->animate_cursor = g_value_get_boolean (value);
-            break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
@@ -171,9 +166,6 @@ mt_settings_get_property (GObject    *object,
         case PROP_CTW_STYLE:
             g_value_set_int (value, ms->ctw_style);
             break;
-        case PROP_ANIMATE_CURSOR:
-            g_value_set_boolean (value, ms->animate_cursor);
-            break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
@@ -259,12 +251,6 @@ mt_settings_class_init (MtSettingsClass *klass)
                                                        "CTW style",
                                                        "Button style in click-type window",
                                                        0, 2, 0, PFLAGS));
-    g_object_class_install_property (object_class,
-                                     PROP_ANIMATE_CURSOR,
-                                     g_param_spec_boolean ("animate-cursor",
-                                                           "Animate cursor",
-                                                           "Draw cursor animation",
-                                                           TRUE, PFLAGS));
 }
 
 MtSettings *
diff --git a/src/mt-settings.h b/src/mt-settings.h
index efbc371..e416996 100644
--- a/src/mt-settings.h
+++ b/src/mt-settings.h
@@ -50,7 +50,6 @@ struct _MtSettings
     guint                       dwell_enabled  : 1;
     guint                       ssc_enabled    : 1;
     guint                       ctw_visible    : 1;
-    guint                       animate_cursor : 1;
 };
 
 GType             mt_settings_get_type              (void) G_GNUC_CONST;