From: Pierre-Luc Beaudoin Date: Sat, 25 Oct 2008 14:10:24 +0000 (-0400) Subject: Tidy clean up X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5de22cc6179175f2723c8492046aa86841c5d3dd;p=libchamplain Tidy clean up Remove some dead code --- diff --git a/tidy/tidy-adjustment.c b/tidy/tidy-adjustment.c index f681716..82fe95c 100644 --- 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 3825d37..daa683f 100644 --- 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