From: Ray Strode <rstrode@redhat.com>
Date: Wed, 23 Sep 2009 21:38:05 +0000 (-0400)
Subject: [animation] Use default event loop
X-Git-Tag: 0.8.0~188^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b10da8890ea0252d52b6ce7a6d38a928dfd77bd;p=thirdparty%2Fplymouth.git

[animation] Use default event loop
---

diff --git a/src/libplybootsplash/ply-animation.c b/src/libplybootsplash/ply-animation.c
index 9bd2b147..170b44ca 100644
--- a/src/libplybootsplash/ply-animation.c
+++ b/src/libplybootsplash/ply-animation.c
@@ -294,16 +294,14 @@ ply_animation_load (ply_animation_t *animation)
 
 bool
 ply_animation_start (ply_animation_t    *animation,
-                     ply_event_loop_t   *loop,
                      ply_pixel_display_t *display,
                      ply_trigger_t      *stop_trigger,
                      long                x,
                      long                y)
 {
   assert (animation != NULL);
-  assert (animation->loop == NULL);
 
-  animation->loop = loop;
+  animation->loop = ply_event_loop_get_default ();
   animation->display = display;
   animation->stop_trigger = stop_trigger;
   animation->is_stopped = false;
diff --git a/src/libplybootsplash/ply-animation.h b/src/libplybootsplash/ply-animation.h
index 7a0bdf33..7b905472 100644
--- a/src/libplybootsplash/ply-animation.h
+++ b/src/libplybootsplash/ply-animation.h
@@ -39,7 +39,6 @@ void ply_animation_free (ply_animation_t *animation);
 
 bool ply_animation_load (ply_animation_t *animation);
 bool ply_animation_start (ply_animation_t    *animation,
-                          ply_event_loop_t   *loop,
                           ply_pixel_display_t *display,
                           ply_trigger_t      *stop_trigger,
                           long                x,
diff --git a/src/plugins/splash/two-step/plugin.c b/src/plugins/splash/two-step/plugin.c
index d52a8e4b..435031e2 100644
--- a/src/plugins/splash/two-step/plugin.c
+++ b/src/plugins/splash/two-step/plugin.c
@@ -290,7 +290,6 @@ view_start_end_animation (view_t         *view,
   y = plugin->animation_vertical_alignment * screen_height - height / 2.0;
 
   ply_animation_start (view->end_animation,
-                       plugin->loop,
                        view->display,
                        trigger, x, y);
 }