From 22f19754b3ed239c49779e0fe0adb7c32f3b0052 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 27 Nov 2007 13:50:01 +0100 Subject: [PATCH] fix merge conflict --- libswfdec/swfdec_movie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswfdec/swfdec_movie.c b/libswfdec/swfdec_movie.c index 8c86e587..74d9b33a 100644 --- a/libswfdec/swfdec_movie.c +++ b/libswfdec/swfdec_movie.c @@ -279,7 +279,7 @@ swfdec_movie_do_remove (SwfdecMovie *movie, gboolean destroy) if ((movie->events && swfdec_event_list_has_conditions (movie->events, SWFDEC_AS_OBJECT (movie), SWFDEC_EVENT_UNLOAD, 0)) || - swfdec_as_object_has_function (SWFDEC_AS_OBJECT (movie), SWFDEC_AS_STR_onUnload)) { + swfdec_as_object_has_variable (SWFDEC_AS_OBJECT (movie), SWFDEC_AS_STR_onUnload)) { swfdec_movie_queue_script (movie, SWFDEC_EVENT_UNLOAD); destroy = FALSE; } -- 2.11.4.GIT