player/swfdec-window.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 3a083100524a69a309b9afbb1b587eadc8e2ea4e
Author: Benjamin Otte <otte at gnome.org>
Date: Mon Jan 14 20:15:13 2008 +0100
whoops, typo
diff --git a/player/swfdec-window.c b/player/swfdec-window.c
index 28d474d..30b6cb1 100644
--- a/player/swfdec-window.c
+++ b/player/swfdec-window.c
@@ -90,7 +90,7 @@ swfdec_window_player_next_event (SwfdecPlayer *player,
GParamSpec *pspec, Swfdec
g_object_get (window->loader, "error", &error,
"eof", &eof, NULL);
if (error) {
- swfdec_window_error (window, _("Error loading
<i>%s</>."),
+ swfdec_window_error (window, _("Error loading
<i>%s</i>."),
swfdec_loader_get_filename (window->loader));
} else if (!swfdec_player_is_initialized (player) &&
swfdec_player_get_next_event (player) < 0 &&
commit 23f700310f828674a57ad0fd6b56a40036754034
Author: Benjamin Otte <otte at gnome.org>
Date: Mon Jan 14 20:13:53 2008 +0100
catch a loader error, too
diff --git a/player/swfdec-window.c b/player/swfdec-window.c
index 01a86e7..28d474d 100644
--- a/player/swfdec-window.c
+++ b/player/swfdec-window.c
@@ -86,9 +86,18 @@ swfdec_window_player_aborted (SwfdecPlayer *player,
GParamSpec *pspec, SwfdecWin
static void
swfdec_window_player_next_event (SwfdecPlayer *player, GParamSpec *pspec,
SwfdecWindow *window)
{
- if (!swfdec_player_is_initialized (player) &&
swfdec_player_get_next_event (player) < 0)
- swfdec_window_error (window, _("%s is not a Flash file."),
+ gboolean eof, error;
+
+ g_object_get (window->loader, "error", &error,
"eof", &eof, NULL);
+ if (error) {
+ swfdec_window_error (window, _("Error loading
<i>%s</>."),
+ swfdec_loader_get_filename (window->loader));
+ } else if (!swfdec_player_is_initialized (player) &&
+ swfdec_player_get_next_event (player) < 0 &&
+ eof) {
+ swfdec_window_error (window, _("<i>%s</i> is not a Flash
file."),
swfdec_loader_get_filename (window->loader));
+ }
}
static void