Tidy clean up

Remove some dead code

diff --git a/tidy/tidy-adjustment.c b/tidy/tidy-adjustment.c
index f6817167adb4f458fd6d1f01d2b23f2fd56da866..82fe95c09885efa96fe9c84746496e48d3fb4374 100644 (file)
--- a/tidy/tidy-adjustment.c
+++ b/tidy/tidy-adjustment.c
@@ -54,7 +54,6 @@ struct _TidyAdjustmentPrivate
   
   /* For elasticity */
   gboolean      elastic;
-  guint         bounce_source;
   ClutterAlpha *bounce_alpha;
 };
 
@@ -184,7 +183,6 @@ static void
 stop_interpolation (TidyAdjustment *adjustment)
 {
   TidyAdjustmentPrivate *priv = adjustment->priv;
-
   if (priv->interpolation)
     {
       clutter_timeline_stop (priv->interpolation);
@@ -197,12 +195,6 @@ stop_interpolation (TidyAdjustment *adjustment)
           priv->bounce_alpha = NULL;
         }
     }
-  
-  if (priv->bounce_source)
-    {
-      g_source_remove (priv->bounce_source);
-      priv->bounce_source = 0;
-    }
 }
 
 static void
@@ -703,7 +695,7 @@ interpolation_new_frame_cb (ClutterTimeline *timeline,
   TidyAdjustmentPrivate *priv = adjustment->priv;
 
   priv->interpolation = NULL;
-  if (priv->elastic)
+  if (priv->elastic && priv->bounce_alpha)
     {
       gdouble progress = clutter_alpha_get_alpha (priv->bounce_alpha) /
         (gdouble)CLUTTER_ALPHA_MAX_ALPHA;

diff --git a/tidy/tidy-scroll-view.c b/tidy/tidy-scroll-view.c
index 3825d371559195264a4dbe1d28c63aa1ca844316..daa683fdb2e4fadb315b8ec3b686ae63e45226c1 100644 (file)
--- a/tidy/tidy-scroll-view.c
+++ b/tidy/tidy-scroll-view.c
@@ -38,9 +38,6 @@ G_DEFINE_TYPE_WITH_CODE (TidyScrollView, tidy_scroll_view, CLUTTER_TYPE_ACTOR,
 struct _TidyScrollViewPrivate
 {
   ClutterActor   *child;
-  
-  TidyAdjustment *hadjustment;
-  TidyAdjustment *vadjustment;
 };
 
 enum {
@@ -247,7 +244,7 @@ tidy_scroll_view_add_actor (ClutterContainer *container,
           /* Notify that child has been set */
           g_signal_emit_by_name (container, "actor-added", priv->child);
           g_object_notify (G_OBJECT (container), "child");
-          
+               
           clutter_actor_queue_relayout (CLUTTER_ACTOR (container));
         }
       else