Swfdec - Nov 2007 - src/swfmoz_player.c

src/swfmoz_player.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 21b574ff96601897f59511902c4dc1e86b6febe8
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Nov 14 21:12:06 2007 +0100

    target may be NULL

diff --git a/src/swfmoz_player.c b/src/swfmoz_player.c
index ec4fd20..e6832e8 100644
--- a/src/swfmoz_player.c
+++ b/src/swfmoz_player.c
@@ -481,7 +481,7 @@ swfmoz_player_set_target (SwfmozPlayer *player, GdkWindow
*target,
     int x, int y, int width, int height)
 {
   g_return_if_fail (SWFMOZ_IS_PLAYER (player));
-  g_return_if_fail (GDK_IS_WINDOW (target));
+  g_return_if_fail (target == NULL || GDK_IS_WINDOW (target));
 
   if (player->target) {
     g_object_unref (player->target);

src/swfmoz_player.c |   19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

New commits:
commit fcd901c169fc17ec9e6dec9ca1b5b250ec5252ca
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Nov 14 21:52:03 2007 +0100

    display file sizes correctly

diff --git a/src/swfmoz_player.c b/src/swfmoz_player.c
index e6832e8..5609ea9 100644
--- a/src/swfmoz_player.c
+++ b/src/swfmoz_player.c
@@ -401,22 +401,29 @@ static void
 swfmoz_player_loaders_update (GtkListStore *store, GtkTreeIter *iter,
SwfdecLoader *loader)
 {
   char *filename = swfdec_loader_get_filename (loader);
-  guint percent;
+  glong percent;
+  gboolean eof;
 
   percent = swfdec_loader_get_size (loader);
-  if (percent) {
-    percent = 100 * swfdec_loader_get_loaded (loader) / percent;
-  } else {
+  if (percent == 0) {
+    percent = 100;
+  } else if (percent < 0) {
     percent = 50;
+  } else {
+    percent = 100 * swfdec_loader_get_loaded (loader) / percent;
+    percent = CLAMP (percent, 0, 100);
   }
+  /* FIXME: swfdec needs a function for this */
+  g_object_get (G_OBJECT (loader), "eof", &eof, NULL);
+
   gtk_list_store_set (store, iter,
     SWFMOZ_LOADER_COLUMN_LOADER, loader,
     SWFMOZ_LOADER_COLUMN_NAME, filename,
     SWFMOZ_LOADER_COLUMN_URL, swfdec_url_get_url (swfdec_loader_get_url
(loader)),
-    SWFMOZ_LOADER_COLUMN_EOF, percent == 100,
+    SWFMOZ_LOADER_COLUMN_EOF, eof,
     SWFMOZ_LOADER_COLUMN_ERROR, loader->error != NULL,
     SWFMOZ_LOADER_COLUMN_TYPE, swfmoz_loader_get_data_type_string (loader),
-    SWFMOZ_LOADER_COLUMN_PERCENT_LOADED, percent,
+    SWFMOZ_LOADER_COLUMN_PERCENT_LOADED, (guint) percent,
     -1);
   g_free (filename);
 }