[Swfdec-commits] 6 commits - configure.ac src/plugin.c src/swfmoz_player.c

[Benjamin Otte]

 configure.ac        |    4 ++--
 src/plugin.c        |    2 ++
 src/swfmoz_player.c |    4 ----
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 9ca711a858351c47548826aaf79025bbd79f38b8
Merge: e02d7e2... e8f4663...
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Sep 24 11:18:51 2008 +0200

    Merge branch '0.8'

commit e02d7e2b60a30ba1ea2495c95617a340e8bf3445
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Sep 24 11:13:33 2008 +0200

    make sure to delete initial stream if it gets destroyed
    
    extra paranoia about flashblock behavior

diff --git a/src/plugin.c b/src/plugin.c
index 48fd413..857d733 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -342,6 +342,8 @@ plugin_destroy_stream_cb (NPP instance, NPStream* stream, NPReason reason)
   swfmoz_loader_ensure_open (stream->pdata);
   swfdec_stream_close (stream->pdata);
   SWFMOZ_LOADER (stream->pdata)->stream = NULL;
+  if (SWFMOZ_PLAYER (instance->pdata)->initial == stream->pdata)
+    SWFMOZ_PLAYER (instance->pdata)->initial = NULL;
   g_object_unref (stream->pdata);
   return NPERR_NO_ERROR;
 }
commit 2048a65d856b89afa9aafca2362dc29d1de82c77
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Sep 24 11:13:00 2008 +0200

    SwfmozPlayer.initial is not a GObject, we must not unref it
    
    fixes crashes caused by flashblock

diff --git a/src/swfmoz_player.c b/src/swfmoz_player.c
index 97abb89..f813748 100644
--- a/src/swfmoz_player.c
+++ b/src/swfmoz_player.c
@@ -552,10 +552,6 @@ swfmoz_player_dispose (GObject *object)
     player->target = NULL;
   }
   swfmoz_player_clear_repaints (player);
-  if (player->initial) {
-    g_object_unref (player->initial);
-    player->initial = NULL;
-  }
   if (player->loaders) {
     g_object_unref (player->loaders);
     player->loaders = NULL;
commit 9d68d04ad8908d70c79cb32c2d31e391e549fbf3
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Sep 24 10:37:48 2008 +0200

    We require 0.9.1, not 0.9
    
    Guess noone compiled this yet? :o

diff --git a/configure.ac b/configure.ac
index 55f8a33..eaf7d36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,8 +49,8 @@ AC_ARG_WITH(pkg-config-path,
 dnl Check for essential libraries first:
 dnl ====================================
 
-SWFDEC_REQUIRES=0.9
-PKG_CHECK_MODULES(SWFDEC, gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR >= $SWFDEC_REQUIRES, HAVE_SWFDEC=yes, HAVE_SWFDEC=no)
+SWFDEC_REQUIRES=0.9.1
+PKG_CHECK_MODULES(SWFDEC, gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR = $SWFDEC_REQUIRES, HAVE_SWFDEC=yes, HAVE_SWFDEC=no)
 if test "$HAVE_SWFDEC" = "no"; then
   AC_MSG_ERROR([cannot find swfdec-$SWFDEC_MAJORMINOR $SWFDEC_REQUIRES, which is required for build])
 fi
commit e8f46635b702d449c27230c69f333b73a72f7b90
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Sep 24 11:13:33 2008 +0200

    make sure to delete initial stream if it gets destroyed
    
    extra paranoia about flashblock behavior

diff --git a/src/plugin.c b/src/plugin.c
index 48fd413..857d733 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -342,6 +342,8 @@ plugin_destroy_stream_cb (NPP instance, NPStream* stream, NPReason reason)
   swfmoz_loader_ensure_open (stream->pdata);
   swfdec_stream_close (stream->pdata);
   SWFMOZ_LOADER (stream->pdata)->stream = NULL;
+  if (SWFMOZ_PLAYER (instance->pdata)->initial == stream->pdata)
+    SWFMOZ_PLAYER (instance->pdata)->initial = NULL;
   g_object_unref (stream->pdata);
   return NPERR_NO_ERROR;
 }
commit c37f02fc20a4ffc74eecfceeaff913a250933320
Author: Benjamin Otte <otte at gnome.org>
Date:   Wed Sep 24 11:13:00 2008 +0200

    SwfmozPlayer.initial is not a GObject, we must not unref it
    
    fixes crashes caused by flashblock

diff --git a/src/swfmoz_player.c b/src/swfmoz_player.c
index 97abb89..f813748 100644
--- a/src/swfmoz_player.c
+++ b/src/swfmoz_player.c
@@ -552,10 +552,6 @@ swfmoz_player_dispose (GObject *object)
     player->target = NULL;
   }
   swfmoz_player_clear_repaints (player);
-  if (player->initial) {
-    g_object_unref (player->initial);
-    player->initial = NULL;
-  }
   if (player->loaders) {
     g_object_unref (player->loaders);
     player->loaders = NULL;