diff -Nru swfdec-mozilla-0.7.4/configure swfdec-mozilla-0.8.0/configure
--- swfdec-mozilla-0.7.4/configure	2008-07-30 12:02:54.000000000 +0200
+++ swfdec-mozilla-0.8.0/configure	2008-09-08 12:47:25.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for swfdec-mozilla 0.7.4.
+# Generated by GNU Autoconf 2.61 for swfdec-mozilla 0.8.0.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@
 # Identity of this package.
 PACKAGE_NAME='swfdec-mozilla'
 PACKAGE_TARNAME='swfdec-mozilla'
-PACKAGE_VERSION='0.7.4'
-PACKAGE_STRING='swfdec-mozilla 0.7.4'
+PACKAGE_VERSION='0.8.0'
+PACKAGE_STRING='swfdec-mozilla 0.8.0'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -843,7 +843,6 @@
 CCDEPMODE
 am__fastdepCC_TRUE
 am__fastdepCC_FALSE
-SWFDEC_LIBVERSION
 build
 build_cpu
 build_vendor
@@ -1402,7 +1401,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures swfdec-mozilla 0.7.4 to adapt to many kinds of systems.
+\`configure' configures swfdec-mozilla 0.8.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1472,7 +1471,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of swfdec-mozilla 0.7.4:";;
+     short | recursive ) echo "Configuration of swfdec-mozilla 0.8.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1579,7 +1578,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-swfdec-mozilla configure 0.7.4
+swfdec-mozilla configure 0.8.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1593,7 +1592,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by swfdec-mozilla $as_me 0.7.4, which was
+It was created by swfdec-mozilla $as_me 0.8.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1947,12 +1946,7 @@
 
 
 
-is_dev=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9][0-9]*\.[0-9]*[13579]/1/')
-if test x"$is_dev" = x1 ; then
-  SWFDEC_CVS="yes"
-else
-  SWFDEC_CVS="no"
-fi
+SWFDEC_DEVEL=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9][0-9]*\.[0-9]*[13579]/yes/')
 
 am__api_version='1.10'
 
@@ -2291,7 +2285,7 @@
 
 # Define the identity of the package.
  PACKAGE='swfdec-mozilla'
- VERSION='0.7.4'
+ VERSION='0.8.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2438,7 +2432,7 @@
 
 
 
-SWFDEC_MAJORMINOR=0.7
+SWFDEC_MAJORMINOR=0.8
 
 
 ac_config_headers="$ac_config_headers config.h"
@@ -3668,7 +3662,7 @@
   { echo "$as_me:$LINENO: result: $flag_ok" >&5
 echo "${ECHO_T}$flag_ok" >&6; }
 
-if test x$SWFDEC_CVS = xyes ; then
+if test x$SWFDEC_DEVEL = xyes ; then
 
   { echo "$as_me:$LINENO: checking to see if compiler understands -Werror" >&5
 echo $ECHO_N "checking to see if compiler understands -Werror... $ECHO_C" >&6; }
@@ -3737,8 +3731,6 @@
 
 fi
 
-SWFDEC_LIBVERSION="0:0:0"
-
 # Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval=$enable_shared; p=${PACKAGE-default}
@@ -4546,7 +4538,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4549 "configure"' > conftest.$ac_ext
+  echo '#line 4541 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7598,11 +7590,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7601: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7593: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7605: \$? = $ac_status" >&5
+   echo "$as_me:7597: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7888,11 +7880,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7891: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7883: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7895: \$? = $ac_status" >&5
+   echo "$as_me:7887: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7992,11 +7984,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7995: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7987: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7999: \$? = $ac_status" >&5
+   echo "$as_me:7991: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10369,7 +10361,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10372 "configure"
+#line 10364 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10469,7 +10461,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10472 "configure"
+#line 10464 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12870,11 +12862,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12873: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12865: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12877: \$? = $ac_status" >&5
+   echo "$as_me:12869: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12974,11 +12966,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12977: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12969: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12981: \$? = $ac_status" >&5
+   echo "$as_me:12973: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14572,11 +14564,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14575: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14567: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14579: \$? = $ac_status" >&5
+   echo "$as_me:14571: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14676,11 +14668,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14679: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14671: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14683: \$? = $ac_status" >&5
+   echo "$as_me:14675: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16896,11 +16888,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16899: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16891: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16903: \$? = $ac_status" >&5
+   echo "$as_me:16895: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17186,11 +17178,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17189: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17181: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17193: \$? = $ac_status" >&5
+   echo "$as_me:17185: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17290,11 +17282,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17293: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17285: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17297: \$? = $ac_status" >&5
+   echo "$as_me:17289: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -21740,7 +21732,7 @@
 
 
 
-SWFDEC_REQUIRES=0.7.4
+SWFDEC_REQUIRES=0.8
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -21871,12 +21863,12 @@
         pkg_cv_SWFDEC_CFLAGS="$SWFDEC_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 swfdec-gtk-\$SWFDEC_MAJORMINOR = \$SWFDEC_REQUIRES\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR = $SWFDEC_REQUIRES") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 swfdec-gtk-\$SWFDEC_MAJORMINOR >= \$SWFDEC_REQUIRES\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR >= $SWFDEC_REQUIRES") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_SWFDEC_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR = $SWFDEC_REQUIRES" 2>/dev/null`
+  pkg_cv_SWFDEC_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR >= $SWFDEC_REQUIRES" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -21889,12 +21881,12 @@
         pkg_cv_SWFDEC_LIBS="$SWFDEC_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 swfdec-gtk-\$SWFDEC_MAJORMINOR = \$SWFDEC_REQUIRES\"") >&5
-  ($PKG_CONFIG --exists --print-errors "gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR = $SWFDEC_REQUIRES") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 swfdec-gtk-\$SWFDEC_MAJORMINOR >= \$SWFDEC_REQUIRES\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR >= $SWFDEC_REQUIRES") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_SWFDEC_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR = $SWFDEC_REQUIRES" 2>/dev/null`
+  pkg_cv_SWFDEC_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR >= $SWFDEC_REQUIRES" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -21913,9 +21905,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        SWFDEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR = $SWFDEC_REQUIRES"`
+	        SWFDEC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR >= $SWFDEC_REQUIRES"`
         else
-	        SWFDEC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR = $SWFDEC_REQUIRES"`
+	        SWFDEC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR >= $SWFDEC_REQUIRES"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$SWFDEC_PKG_ERRORS" >&5
@@ -22400,7 +22392,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by swfdec-mozilla $as_me 0.7.4, which was
+This file was extended by swfdec-mozilla $as_me 0.8.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22453,7 +22445,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-swfdec-mozilla config.status 0.7.4
+swfdec-mozilla config.status 0.8.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -22718,7 +22710,6 @@
 CCDEPMODE!$CCDEPMODE$ac_delim
 am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
 am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-SWFDEC_LIBVERSION!$SWFDEC_LIBVERSION$ac_delim
 build!$build$ac_delim
 build_cpu!$build_cpu$ac_delim
 build_vendor!$build_vendor$ac_delim
@@ -22738,6 +22729,7 @@
 NMEDIT!$NMEDIT$ac_delim
 CPP!$CPP$ac_delim
 CXX!$CXX$ac_delim
+CXXFLAGS!$CXXFLAGS$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -22779,7 +22771,6 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
-CXXFLAGS!$CXXFLAGS$ac_delim
 ac_ct_CXX!$ac_ct_CXX$ac_delim
 CXXDEPMODE!$CXXDEPMODE$ac_delim
 am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
@@ -22799,7 +22790,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 18; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/configure.ac /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/configure.ac
--- swfdec-mozilla-0.7.4/configure.ac	2008-07-30 12:02:38.000000000 +0200
+++ swfdec-mozilla-0.8.0/configure.ac	2008-09-08 12:47:18.000000000 +0200
@@ -1,17 +1,12 @@
 AC_PREREQ([2.58])
-AC_INIT(swfdec-mozilla,0.7.4)
+AC_INIT(swfdec-mozilla,0.8.0)
 
-[is_dev=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9][0-9]*\.[0-9]*[13579]/1/')]
-if test x"$is_dev" = x1 ; then
-  SWFDEC_CVS="yes"
-else
-  SWFDEC_CVS="no"
-fi
+[SWFDEC_DEVEL=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9][0-9]*\.[0-9]*[13579]/yes/')]
 
 AM_INIT_AUTOMAKE(1.6)
 dnl AC_CANONICAL_TARGET([])
 
-SWFDEC_MAJORMINOR=0.7
+SWFDEC_MAJORMINOR=0.8
 AC_SUBST(SWFDEC_MAJORMINOR)
 
 AM_CONFIG_HEADER(config.h)
@@ -24,12 +19,10 @@
 dnl AS_COMPILER_FLAG(-Wshadow, GLOBAL_CFLAGS="$GLOBAL_CFLAGS -Wshadow")
 AS_COMPILER_FLAG(-Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wold-style-definition -Wdeclaration-after-statement -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wformat-nonliteral -Wformat-security -Wswitch-enum -Wswitch-default, GLOBAL_CFLAGS="$GLOBAL_CFLAGS -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wold-style-definition -Wdeclaration-after-statement -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Winline -Wformat-nonliteral -Wformat-security -Wswitch-enum -Wswitch-default")
 dnl if we're in nano >= 1, add -Werror if supported
-if test x$SWFDEC_CVS = xyes ; then
+if test x$SWFDEC_DEVEL = xyes ; then
   AS_COMPILER_FLAG(-Werror, GLOBAL_CFLAGS="$GLOBAL_CFLAGS -Werror")
 fi
 
-SWFDEC_LIBVERSION="0:0:0"
-AC_SUBST(SWFDEC_LIBVERSION)
 AM_PROG_LIBTOOL
 
 dnl Add parameters for aclocal
@@ -56,8 +49,8 @@
 dnl Check for essential libraries first:
 dnl ====================================
 
-SWFDEC_REQUIRES=0.7.4
-PKG_CHECK_MODULES(SWFDEC, gmodule-2.0 swfdec-gtk-$SWFDEC_MAJORMINOR = $SWFDEC_REQUIRES, HAVE_SWFDEC=yes, HAVE_SWFDEC=no)
+SWFDEC_REQUIRES=0.8
+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
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/debian/changelog /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/debian/changelog
--- swfdec-mozilla-0.7.4/debian/changelog	2008-10-14 16:07:33.000000000 +0200
+++ swfdec-mozilla-0.8.0/debian/changelog	2008-10-14 16:07:34.000000000 +0200
@@ -1,3 +1,20 @@
+swfdec-mozilla (0.8.0-0ubuntu1) intrepid; urgency=low
+
+  * New upstream version (LP: #279207)
+    - Add UI for handling autoplay to the right-click menu
+    - Bump reported version to 9.0r999
+    - Fix some rare crashers
+  * debian/control:
+    - buildd depends now on libswfdec-0.8-dev
+    - change Xb-Npp-Name to not mention Adobe, Macromedia or Flash
+    - add Xb-Npp-Description & Xb-Npp-File fields
+    - suggest ubufox
+  * debian/swfdec-mozilla.postinst: touch FF 3 .autoreg to reregister
+    chrome and reintrospect system extensions
+  * debian/swfdec-mozilla.links: add symlink to usr/share/ubufox/plugins
+
+ -- Didier Roche <didrocks@ubuntu.com>  Tue, 14 Oct 2008 08:30:50 +0200
+
 swfdec-mozilla (0.7.4-2ubuntu1) intrepid; urgency=low
 
   Ubuntu changes:
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/debian/control /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/debian/control
--- swfdec-mozilla-0.7.4/debian/control	2008-10-14 16:07:33.000000000 +0200
+++ swfdec-mozilla-0.8.0/debian/control	2008-10-14 16:07:34.000000000 +0200
@@ -3,7 +3,7 @@
 Section: utils
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Santiago Garcia Mantinan <manty@debian.org>
-Build-Depends: cdbs, debhelper (>= 5), libswfdec-0.7-dev (>= 0.7.4)
+Build-Depends: cdbs, debhelper (>= 5), libswfdec-0.8-dev
 Standards-Version: 3.8.0
 
 Package: swfdec-mozilla
@@ -12,7 +12,10 @@
 Depends: ${shlibs:Depends}
 Xb-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384,92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a,aa5ca914-c309-495d-91cf-3141bbb04115
 Xb-Npp-MimeType: application/x-shockwave-flash, application/futuresplash
-Xb-Npp-Name: Swfdec player for Adobe/Macromedia Flash
+Xb-Npp-Name: Swfdec SWF player
+Xb-Npp-Description: GNOME SWF player (http://swfdec.freedesktop.org/)
+Xb-Npp-File: libswfdecmozilla.so
+Suggests: ubufox
 Provides: swf-player
 Replaces: swf-player
 Conflicts: swf-player
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/debian/swfdec-mozilla.links /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/debian/swfdec-mozilla.links
--- swfdec-mozilla-0.7.4/debian/swfdec-mozilla.links	1970-01-01 01:00:00.000000000 +0100
+++ swfdec-mozilla-0.8.0/debian/swfdec-mozilla.links	2008-10-14 16:07:34.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/swfdec-mozilla/libswfdecmozilla.so usr/share/ubufox/plugins/libswfdecmozilla.so
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/debian/swfdec-mozilla.postinst /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/debian/swfdec-mozilla.postinst
--- swfdec-mozilla-0.7.4/debian/swfdec-mozilla.postinst	2008-10-14 16:07:33.000000000 +0200
+++ swfdec-mozilla-0.8.0/debian/swfdec-mozilla.postinst	2008-10-14 16:07:34.000000000 +0200
@@ -7,6 +7,9 @@
 		      for p in iceape iceweasel mozilla firefox xulrunner midbrowser xulrunner-addons; do 
 						update-alternatives --install "/usr/lib/$p/plugins/flashplugin-alternative.so" "$p-flashplugin" /usr/lib/swfdec-mozilla/libswfdecmozilla.so 50;
 					done
+		for i in `ls /usr/lib/firefox-3*/.autoreg || true`: do
+			touch $i;
+		done
         ;;
         abort-upgrade|abort-remove|abort-deconfigure)
                 echo "postinst called with argument \`$1'" >&2
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/icons/16x16/Makefile.in /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/icons/16x16/Makefile.in
--- swfdec-mozilla-0.7.4/icons/16x16/Makefile.in	2008-07-30 12:02:52.000000000 +0200
+++ swfdec-mozilla-0.8.0/icons/16x16/Makefile.in	2008-09-08 12:47:25.000000000 +0200
@@ -117,7 +117,6 @@
 STRIP = @STRIP@
 SWFDEC_CFLAGS = @SWFDEC_CFLAGS@
 SWFDEC_LIBS = @SWFDEC_LIBS@
-SWFDEC_LIBVERSION = @SWFDEC_LIBVERSION@
 SWFDEC_MAJORMINOR = @SWFDEC_MAJORMINOR@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/icons/22x22/Makefile.in /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/icons/22x22/Makefile.in
--- swfdec-mozilla-0.7.4/icons/22x22/Makefile.in	2008-07-30 12:02:52.000000000 +0200
+++ swfdec-mozilla-0.8.0/icons/22x22/Makefile.in	2008-09-08 12:47:25.000000000 +0200
@@ -117,7 +117,6 @@
 STRIP = @STRIP@
 SWFDEC_CFLAGS = @SWFDEC_CFLAGS@
 SWFDEC_LIBS = @SWFDEC_LIBS@
-SWFDEC_LIBVERSION = @SWFDEC_LIBVERSION@
 SWFDEC_MAJORMINOR = @SWFDEC_MAJORMINOR@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/icons/24x24/Makefile.in /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/icons/24x24/Makefile.in
--- swfdec-mozilla-0.7.4/icons/24x24/Makefile.in	2008-07-30 12:02:52.000000000 +0200
+++ swfdec-mozilla-0.8.0/icons/24x24/Makefile.in	2008-09-08 12:47:25.000000000 +0200
@@ -117,7 +117,6 @@
 STRIP = @STRIP@
 SWFDEC_CFLAGS = @SWFDEC_CFLAGS@
 SWFDEC_LIBS = @SWFDEC_LIBS@
-SWFDEC_LIBVERSION = @SWFDEC_LIBVERSION@
 SWFDEC_MAJORMINOR = @SWFDEC_MAJORMINOR@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/icons/32x32/Makefile.in /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/icons/32x32/Makefile.in
--- swfdec-mozilla-0.7.4/icons/32x32/Makefile.in	2008-07-30 12:02:52.000000000 +0200
+++ swfdec-mozilla-0.8.0/icons/32x32/Makefile.in	2008-09-08 12:47:25.000000000 +0200
@@ -117,7 +117,6 @@
 STRIP = @STRIP@
 SWFDEC_CFLAGS = @SWFDEC_CFLAGS@
 SWFDEC_LIBS = @SWFDEC_LIBS@
-SWFDEC_LIBVERSION = @SWFDEC_LIBVERSION@
 SWFDEC_MAJORMINOR = @SWFDEC_MAJORMINOR@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/icons/48x48/Makefile.in /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/icons/48x48/Makefile.in
--- swfdec-mozilla-0.7.4/icons/48x48/Makefile.in	2008-07-30 12:02:52.000000000 +0200
+++ swfdec-mozilla-0.8.0/icons/48x48/Makefile.in	2008-09-08 12:47:25.000000000 +0200
@@ -117,7 +117,6 @@
 STRIP = @STRIP@
 SWFDEC_CFLAGS = @SWFDEC_CFLAGS@
 SWFDEC_LIBS = @SWFDEC_LIBS@
-SWFDEC_LIBVERSION = @SWFDEC_LIBVERSION@
 SWFDEC_MAJORMINOR = @SWFDEC_MAJORMINOR@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/icons/Makefile.in /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/icons/Makefile.in
--- swfdec-mozilla-0.7.4/icons/Makefile.in	2008-07-30 12:02:52.000000000 +0200
+++ swfdec-mozilla-0.8.0/icons/Makefile.in	2008-09-08 12:47:25.000000000 +0200
@@ -119,7 +119,6 @@
 STRIP = @STRIP@
 SWFDEC_CFLAGS = @SWFDEC_CFLAGS@
 SWFDEC_LIBS = @SWFDEC_LIBS@
-SWFDEC_LIBVERSION = @SWFDEC_LIBVERSION@
 SWFDEC_MAJORMINOR = @SWFDEC_MAJORMINOR@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/icons/scalable/Makefile.in /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/icons/scalable/Makefile.in
--- swfdec-mozilla-0.7.4/icons/scalable/Makefile.in	2008-07-30 12:02:52.000000000 +0200
+++ swfdec-mozilla-0.8.0/icons/scalable/Makefile.in	2008-09-08 12:47:25.000000000 +0200
@@ -117,7 +117,6 @@
 STRIP = @STRIP@
 SWFDEC_CFLAGS = @SWFDEC_CFLAGS@
 SWFDEC_LIBS = @SWFDEC_LIBS@
-SWFDEC_LIBVERSION = @SWFDEC_LIBVERSION@
 SWFDEC_MAJORMINOR = @SWFDEC_MAJORMINOR@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/Makefile.in /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/Makefile.in
--- swfdec-mozilla-0.7.4/Makefile.in	2008-07-30 12:02:53.000000000 +0200
+++ swfdec-mozilla-0.8.0/Makefile.in	2008-09-08 12:47:25.000000000 +0200
@@ -134,7 +134,6 @@
 STRIP = @STRIP@
 SWFDEC_CFLAGS = @SWFDEC_CFLAGS@
 SWFDEC_LIBS = @SWFDEC_LIBS@
-SWFDEC_LIBVERSION = @SWFDEC_LIBVERSION@
 SWFDEC_MAJORMINOR = @SWFDEC_MAJORMINOR@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/mozilla-sucks/Makefile.in /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/mozilla-sucks/Makefile.in
--- swfdec-mozilla-0.7.4/mozilla-sucks/Makefile.in	2008-07-30 12:02:53.000000000 +0200
+++ swfdec-mozilla-0.8.0/mozilla-sucks/Makefile.in	2008-09-08 12:47:25.000000000 +0200
@@ -112,7 +112,6 @@
 STRIP = @STRIP@
 SWFDEC_CFLAGS = @SWFDEC_CFLAGS@
 SWFDEC_LIBS = @SWFDEC_LIBS@
-SWFDEC_LIBVERSION = @SWFDEC_LIBVERSION@
 SWFDEC_MAJORMINOR = @SWFDEC_MAJORMINOR@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/NEWS /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/NEWS
--- swfdec-mozilla-0.7.4/NEWS	2008-07-30 13:18:46.000000000 +0200
+++ swfdec-mozilla-0.8.0/NEWS	2008-09-08 12:52:59.000000000 +0200
@@ -1,4 +1,11 @@
 
+ 0.8.0 ("Best Friends Forever")
+
+Second long-term of Swfdec, here we go:
+- Add UI for handling autoplay to the right-click menu
+- Bump reported version to 9.0r999
+- Fix some rare crashers
+
  0.7.4 ("Whites won again")
 
 Not much has happened here since the last release:
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/src/Makefile.in /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/src/Makefile.in
--- swfdec-mozilla-0.7.4/src/Makefile.in	2008-07-30 12:02:53.000000000 +0200
+++ swfdec-mozilla-0.8.0/src/Makefile.in	2008-09-08 12:47:25.000000000 +0200
@@ -146,7 +146,6 @@
 STRIP = @STRIP@
 SWFDEC_CFLAGS = @SWFDEC_CFLAGS@
 SWFDEC_LIBS = @SWFDEC_LIBS@
-SWFDEC_LIBVERSION = @SWFDEC_LIBVERSION@
 SWFDEC_MAJORMINOR = @SWFDEC_MAJORMINOR@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/src/plugin.c /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/src/plugin.c
--- swfdec-mozilla-0.7.4/src/plugin.c	2008-07-16 21:03:51.000000000 +0200
+++ swfdec-mozilla-0.8.0/src/plugin.c	2008-09-03 23:00:39.000000000 +0200
@@ -36,7 +36,7 @@
 
 /* This is here so we can quickly disable windowless support. For now it's 
  * missing some features (cursor support) and redraws seem to be buggy */
-#define ENABLE_WINDOWLESS
+//#define DISABLE_WINDOWLESS
 
 NPNetscapeFuncs mozilla_funcs;
 
@@ -127,7 +127,7 @@
       break;
     case NPPVpluginDescriptionString:
       /* FIXME: find a way to encode the Swfdec version without breaking stupid JS scripts */
-      *val = (char *) "Shockwave Flash 9.0 r100";
+      *val = (char *) "Shockwave Flash 9.0 r999";
       break;
     case NPPVpluginNeedsXEmbed:
       *((PRBool*) val) = PR_FALSE;
@@ -179,7 +179,7 @@
   return TRUE;
 }
 
-#ifdef ENABLE_WINDOWLESS
+#ifndef DISABLE_WINDOWLESS
 /* returns true if this instance can run windowless */
 static gboolean
 plugin_try_windowless (NPP instance)
@@ -230,7 +230,7 @@
    * won't be unloaded, i.e. NPPVpluginKeepLibraryInMemory was successful */
   swfdec_init ();
 
-#ifdef ENABLE_WINDOWLESS
+#ifndef DISABLE_WINDOWLESS
   /* parse pre-creation properties */
   for (i = 0; i < argc; i++) {
     if (g_ascii_strcasecmp (argn[i], "wmode") == 0) {
@@ -396,7 +396,8 @@
 
   if (window) {
     plugin_x11_setup_windowed (instance->pdata, (Window) window->window, 
-	window->x, window->y, window->width, window->height);
+	window->x, window->y, window->width, window->height,
+	((NPSetWindowCallbackStruct *)window->ws_info)->visual);
   } else {
     plugin_x11_teardown (instance->pdata);
   }
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/src/plugin.h /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/src/plugin.h
--- swfdec-mozilla-0.7.4/src/plugin.h	2008-05-27 10:59:03.000000000 +0200
+++ swfdec-mozilla-0.8.0/src/plugin.h	2008-09-05 18:29:23.000000000 +0200
@@ -20,7 +20,7 @@
 #ifndef _SWFMOZ_PLUGIN_H_
 #define _SWFMOZ_PLUGIN_H_
 
-#include <glib.h>
+#include <gdk/gdk.h>
 #include <npapi.h>
 
 G_BEGIN_DECLS
@@ -59,5 +59,9 @@
 						 gboolean	allow);
 gboolean	plugin_pop_allow_popups		(NPP		instance);
 
+/* in plugin_x11.h */
+GdkWindow *	plugin_get_window		(NPP		instance);
+
+
 G_END_DECLS
 #endif
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/src/plugin_x11.c /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/src/plugin_x11.c
--- swfdec-mozilla-0.7.4/src/plugin_x11.c	2008-05-27 10:59:03.000000000 +0200
+++ swfdec-mozilla-0.8.0/src/plugin_x11.c	2008-09-05 18:29:48.000000000 +0200
@@ -51,7 +51,7 @@
 	GdkRectangle rect = { expose->x, expose->y, expose->width, expose->height };
 	GdkRegion *region = gdk_region_rectangle (&rect);
 	cairo_surface_t *surface = cairo_xlib_surface_create (expose->display, 
-	    expose->drawable, GDK_VISUAL_XVISUAL (gdk_drawable_get_visual (mozplay->target)),
+	    expose->drawable, mozplay->target_visual,
 	    expose->x + expose->width, expose->y + expose->height);
 	cairo_t *cr = cairo_create (surface);
 	swfmoz_player_render (mozplay, cr, region);
@@ -129,7 +129,7 @@
 	XConfigureEvent *conf = (XConfigureEvent *) event;
 
 	if (!mozplay->windowless)
-	  swfmoz_player_set_target (mozplay, mozplay->target, 0, 0, conf->width, conf->height);
+	  swfmoz_player_set_target (mozplay, mozplay->target, 0, 0, conf->width, conf->height, mozplay->target_visual);
 	break;
       }
     default:
@@ -147,7 +147,7 @@
 
 void
 plugin_x11_setup_windowed (SwfmozPlayer *player, Window xwindow, 
-    int x, int y, int width, int height)
+    int x, int y, int width, int height, Visual *visual)
 {
   if (player->windowless) {
     if (player->target == NULL) {
@@ -157,9 +157,9 @@
 	g_printerr ("cannot set window given for setup (id %lu)\n", xwindow);
 	return;
       }
-      swfmoz_player_set_target (player, window, x, y, width, height);
+      swfmoz_player_set_target (player, window, x, y, width, height, visual);
     } else {
-      swfmoz_player_set_target (player, player->target, x, y, width, height);
+      swfmoz_player_set_target (player, player->target, x, y, width, height, visual);
     }
   } else {
     if (player->target == NULL) {
@@ -186,7 +186,7 @@
       window = gdk_window_new (parent, &attr, GDK_WA_X | GDK_WA_Y);
       gdk_window_add_filter (window, plugin_x11_filter_event, player);
       gdk_window_show (window);
-      swfmoz_player_set_target (player, window, 0, 0, width, height);
+      swfmoz_player_set_target (player, window, 0, 0, width, height, visual);
     } else {
       gdk_window_move_resize (player->target, 0, 0, width, height);
     }
@@ -199,5 +199,22 @@
   if (player->target) {
     gdk_window_remove_filter (player->target, plugin_x11_filter_event, player);
   }
-  swfmoz_player_set_target (player, NULL, 0, 0, 0, 0);
+  swfmoz_player_set_target (player, NULL, 0, 0, 0, 0, NULL);
 }
+
+GdkWindow *
+plugin_get_window (NPP instance)
+{
+  Window xid;
+  GdkWindow *window;
+
+  if (!plugin_get_value (instance, NPNVnetscapeWindow, &xid))
+    return NULL;
+  
+  window = gdk_window_lookup (xid);
+  if (window)
+    return window;
+
+  return gdk_window_foreign_new (xid);
+}
+
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/src/plugin_x11.h /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/src/plugin_x11.h
--- swfdec-mozilla-0.7.4/src/plugin_x11.h	2008-05-27 10:59:03.000000000 +0200
+++ swfdec-mozilla-0.8.0/src/plugin_x11.h	2008-09-05 18:28:11.000000000 +0200
@@ -26,16 +26,17 @@
 
 G_BEGIN_DECLS
 
+void		plugin_x11_setup_windowed	(SwfmozPlayer *	      player,
+						 Window		      window,
+						 int		      x,
+						 int		      y,
+						 int		      width,
+						 int		      height,
+						 Visual *	      visual);
+void		plugin_x11_teardown		(SwfmozPlayer *	      player);
+void		plugin_x11_handle_event		(SwfmozPlayer *	      player,
+						 XEvent *	      event);
 
-void	plugin_x11_setup_windowed	(SwfmozPlayer *	      player,
-					 Window		      window,
-					 int		      x,
-					 int		      y,
-					 int		      width,
-					 int		      height);
-void	plugin_x11_teardown		(SwfmozPlayer *	      player);
-void	plugin_x11_handle_event		(SwfmozPlayer *	      player,
-					 XEvent *	      event);
 
 G_END_DECLS
 #endif
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/src/swfmoz_config.c /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/src/swfmoz_config.c
--- swfdec-mozilla-0.7.4/src/swfmoz_config.c	2008-07-17 16:24:37.000000000 +0200
+++ swfdec-mozilla-0.8.0/src/swfmoz_config.c	2008-08-27 11:11:05.000000000 +0200
@@ -35,20 +35,10 @@
   gchar *data;
   gsize data_size;
   GError *error = NULL;
-  gboolean has_global;
 
   gchar *keyfile_name = g_build_filename (g_get_user_config_dir (),
 					  SWFMOZ_CONFIG_FILE, NULL);
 
-  has_global = g_key_file_has_key (config->keyfile, "global", "autoplay",
-				   &error);
-  if (error) {
-    g_error_free (error);
-    error = NULL;
-  } else if (!has_global) {
-    g_key_file_set_boolean (config->keyfile, "global", "autoplay", FALSE);
-  }
-
   data = g_key_file_to_data (config->keyfile, &data_size, &error);
   if (error) {
     goto fail;
@@ -94,7 +84,21 @@
   return keyfile;
 }
 
-static gboolean
+gboolean
+swfmoz_config_has_global_key (SwfmozConfig *config)
+{
+  GError *error = NULL;
+  gboolean ret;
+
+  ret = g_key_file_has_key (config->keyfile, "global", "autoplay",
+				 &error);
+  if (error)
+    g_error_free (error);
+
+  return ret;
+}
+
+gboolean
 swfmoz_config_read_autoplay (SwfmozConfig *config, const char *host,
 			     gboolean autoplay)
 {
@@ -120,11 +124,13 @@
 
   g_return_val_if_fail (SWFMOZ_IS_CONFIG (config), FALSE);
 
+  if (swfmoz_config_has_global_key (config))
+    return swfmoz_config_read_autoplay (config, "global", autoplay);
+
   host = swfdec_url_get_host (url);
   if (host == NULL)
     host = swfdec_url_get_protocol (url);
 
-  autoplay = swfmoz_config_read_autoplay (config, "global", autoplay);
   autoplay = swfmoz_config_read_autoplay (config, host, autoplay);
 
   return autoplay;
@@ -148,6 +154,29 @@
   swfmoz_config_save_file (config);
 }
 
+void
+swfmoz_config_set_global_autoplay (SwfmozConfig *config, gboolean autoplay)
+{
+  g_return_if_fail (SWFMOZ_IS_CONFIG (config));
+
+  g_key_file_set_boolean (config->keyfile, "global", "autoplay", autoplay);
+
+  swfmoz_config_save_file (config);
+}
+
+void
+swfmoz_config_remove_global_autoplay (SwfmozConfig *config)
+{
+  GError *error = NULL;
+  g_return_if_fail (SWFMOZ_IS_CONFIG (config));
+
+  g_key_file_remove_key (config->keyfile, "global", "autoplay", &error);
+  if (error)
+    g_error_free (error);
+
+  swfmoz_config_save_file (config);
+}
+
 static void
 swfmoz_config_dispose (GObject *object)
 {
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/src/swfmoz_config.h /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/src/swfmoz_config.h
--- swfdec-mozilla-0.7.4/src/swfmoz_config.h	2008-05-27 10:59:03.000000000 +0200
+++ swfdec-mozilla-0.8.0/src/swfmoz_config.h	2008-08-27 11:11:05.000000000 +0200
@@ -46,14 +46,21 @@
  GObjectClass 	parent;
 };
 
-GType		swfmoz_config_get_type   	(void);
+GType		swfmoz_config_get_type			(void);
 
-SwfmozConfig *	swfmoz_config_new		(void);
-gboolean 	swfmoz_config_should_autoplay 	(SwfmozConfig *config,
-						 const SwfdecURL *url);
-void		swfmoz_config_set_autoplay 	(SwfmozConfig *config,
-						 const SwfdecURL *url,
-						 gboolean autoplay);
+SwfmozConfig *	swfmoz_config_new			(void);
+gboolean	swfmoz_config_read_autoplay		(SwfmozConfig *config,
+							 const char *host,
+							 gboolean autoplay);
+gboolean 	swfmoz_config_should_autoplay 		(SwfmozConfig *config,
+							 const SwfdecURL *url);
+void		swfmoz_config_set_autoplay 		(SwfmozConfig *config,
+							 const SwfdecURL *url,
+							 gboolean autoplay);
+gboolean	swfmoz_config_has_global_key		(SwfmozConfig *config);
+void		swfmoz_config_set_global_autoplay	(SwfmozConfig *config,
+							 gboolean autoplay);
+void		swfmoz_config_remove_global_autoplay	(SwfmozConfig *config);
 
 G_END_DECLS
 #endif
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/src/swfmoz_loader.c /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/src/swfmoz_loader.c
--- swfdec-mozilla-0.7.4/src/swfmoz_loader.c	2008-07-22 14:53:46.000000000 +0200
+++ swfdec-mozilla-0.8.0/src/swfmoz_loader.c	2008-08-27 11:51:31.000000000 +0200
@@ -56,7 +56,7 @@
   SwfmozLoader *moz = SWFMOZ_LOADER (loader);
 
   moz->waiting_for_stream = TRUE;
-  moz->instance = mozplay->instance;
+  moz->instance = &mozplay->instance;
   if (mozplay->initial) {
     swfmoz_loader_set_stream (moz, mozplay->initial);
     mozplay->initial = NULL;
@@ -68,12 +68,12 @@
 
       combined = swfmoz_player_add_headers (buffer, header_count, header_names,
 	  header_values);
-      plugin_post_url_notify (moz->instance, url, NULL, (char *)combined->data,
+      plugin_post_url_notify (*moz->instance, url, NULL, (char *)combined->data,
 	  combined->length, moz);
       swfdec_buffer_unref (combined);
     } else {
       // FIXME: Impossible to set headers here?
-      plugin_get_url_notify (moz->instance, url, NULL, moz);
+      plugin_get_url_notify (*moz->instance, url, NULL, moz);
     }
   }
 }
@@ -85,8 +85,8 @@
 
   moz->waiting_for_stream = FALSE;
 
-  if (moz->stream)
-    plugin_destroy_stream (moz->instance, moz->stream);
+  if (*moz->instance && moz->stream)
+    plugin_destroy_stream (*moz->instance, moz->stream);
 }
 
 static void
@@ -116,7 +116,7 @@
   g_return_if_fail (stream != NULL);
 
   if (!loader->waiting_for_stream) {
-    plugin_destroy_stream (loader->instance, stream);
+    plugin_destroy_stream (*loader->instance, stream);
     return;
   }
 
@@ -138,7 +138,7 @@
   if (loader->open)
     return;
   swfdec_loader_set_url (SWFDEC_LOADER (loader), loader->stream->url);
-  swfmoz_player_add_loader (loader->instance->pdata, loader);
+  swfmoz_player_add_loader ((*loader->instance)->pdata, loader);
   swfdec_stream_open (SWFDEC_STREAM (loader));
   loader->open = TRUE;
 }
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/src/swfmoz_loader.h /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/src/swfmoz_loader.h
--- swfdec-mozilla-0.7.4/src/swfmoz_loader.h	2008-07-22 14:53:34.000000000 +0200
+++ swfdec-mozilla-0.8.0/src/swfmoz_loader.h	2008-08-27 11:50:27.000000000 +0200
@@ -40,7 +40,7 @@
 {
   SwfdecLoader		parent;
 
-  NPP			instance;	/* instance we belong to */
+  NPP *			instance;	/* pointer to instance we belong to or to NULL if we don't belong to any instance */
   NPStream *		stream;		/* stream we do or NULL if not created yet */
   gboolean		initial;	/* we are the initial loader */
 
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/src/swfmoz_player.c /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/src/swfmoz_player.c
--- swfdec-mozilla-0.7.4/src/swfmoz_player.c	2008-07-30 10:50:18.000000000 +0200
+++ swfdec-mozilla-0.8.0/src/swfmoz_player.c	2008-09-05 18:29:04.000000000 +0200
@@ -65,6 +65,31 @@
 }
 
 static void
+swfmoz_player_menu_autoplay_always_toggled (GtkCheckMenuItem *item,
+    SwfmozPlayer* player)
+{
+  gboolean item_active = gtk_check_menu_item_get_active (item);
+  swfmoz_config_set_global_autoplay (player->config, item_active);
+}
+
+static void
+swfmoz_player_menu_autoplay_remember_last_toggled (GtkCheckMenuItem *item,
+    SwfmozPlayer* player)
+{
+  gboolean item_active = gtk_check_menu_item_get_active (item);
+  if (item_active && swfmoz_config_has_global_key (player->config))
+    swfmoz_config_remove_global_autoplay (player->config);
+}
+
+static void
+swfmoz_player_menu_autoplay_never_toggled (GtkCheckMenuItem *item,
+    SwfmozPlayer* player)
+{
+  gboolean item_active = gtk_check_menu_item_get_active (item);
+  swfmoz_config_set_global_autoplay (player->config, !item_active);
+}
+
+static void
 swfmoz_player_menu_about (GtkMenuItem *item, SwfmozPlayer *player)
 {
   static const char *authors[] = {
@@ -95,31 +120,62 @@
 swfmoz_player_popup_menu (SwfmozPlayer *player)
 {
   if (player->menu == NULL) {
-    GtkWidget *item;
+    GtkWidget *item, *submenu;
 
     player->menu = GTK_MENU (gtk_menu_new ());
     g_object_ref_sink (player->menu);
     
     item = gtk_check_menu_item_new_with_mnemonic ("Playing");
-    g_signal_connect (item, "toggled", 
+    g_signal_connect (item, "toggled",
 	G_CALLBACK (swfmoz_player_menu_playing_toggled), player);
     g_signal_connect (player, "notify::playing",
 	G_CALLBACK (swfmoz_player_menu_notify_playing), item);
-    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), 
+    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
 	swfdec_gtk_player_get_playing (SWFDEC_GTK_PLAYER (player)));
     gtk_widget_show (item);
     gtk_menu_shell_append (GTK_MENU_SHELL (player->menu), item);
 
     item = gtk_check_menu_item_new_with_mnemonic ("Enable Audio");
-    g_signal_connect (item, "toggled", 
+    g_signal_connect (item, "toggled",
 	G_CALLBACK (swfmoz_player_menu_audio_toggled), player);
     g_signal_connect (player, "notify::audio-enabled",
 	G_CALLBACK (swfmoz_player_menu_notify_audio), item);
-    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), 
+    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
 	swfdec_gtk_player_get_audio_enabled (SWFDEC_GTK_PLAYER (player)));
     gtk_widget_show (item);
     gtk_menu_shell_append (GTK_MENU_SHELL (player->menu), item);
 
+    submenu = gtk_menu_new();
+    item = gtk_radio_menu_item_new_with_mnemonic (NULL, "Always");
+    g_signal_connect (item, "toggled",
+        G_CALLBACK (swfmoz_player_menu_autoplay_always_toggled), player);
+    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
+	swfmoz_config_read_autoplay (player->config, "global", FALSE));
+    gtk_widget_show (item);
+    gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
+
+    item = gtk_radio_menu_item_new_with_mnemonic_from_widget (GTK_RADIO_MENU_ITEM (item),
+        "Remember last choice");
+    g_signal_connect (item, "toggled",
+	G_CALLBACK (swfmoz_player_menu_autoplay_remember_last_toggled), player);
+    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
+        !swfmoz_config_has_global_key (player->config));
+    gtk_widget_show (item);
+    gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
+
+    item = gtk_radio_menu_item_new_with_mnemonic_from_widget (GTK_RADIO_MENU_ITEM (item), "Never");
+    g_signal_connect (item, "toggled",
+        G_CALLBACK (swfmoz_player_menu_autoplay_never_toggled), player);
+    gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
+	!swfmoz_config_read_autoplay (player->config, "global", TRUE));
+    gtk_widget_show (item);
+    gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
+
+    item = gtk_menu_item_new_with_label ("Autoplay");
+    gtk_widget_show (item);
+    gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), submenu);
+    gtk_menu_shell_append (GTK_MENU_SHELL (player->menu), item);
+
     item = gtk_separator_menu_item_new ();
     gtk_widget_show (item);
     gtk_menu_shell_append (GTK_MENU_SHELL (player->menu), item);
@@ -188,6 +244,9 @@
   GdkRegion *region;
   guint i;
 
+  if (player->target == NULL)
+    return;
+
   if (player->repaint)
     region = player->repaint;
   else
@@ -399,6 +458,33 @@
   }
 }
 
+static gboolean
+swfmoz_player_query_size (SwfmozPlayer *player, gboolean fullscreen, 
+    int *width, int *height)
+{
+  if (fullscreen) {
+    GdkWindow *window = plugin_get_window (player->instance);
+    GdkScreen *screen;
+    GdkRectangle rect;
+    int monitor;
+
+    if (window == NULL)
+      return FALSE;
+    screen = gdk_drawable_get_screen (GDK_DRAWABLE (window));
+    monitor = gdk_screen_get_monitor_at_window (screen, window);
+    gdk_screen_get_monitor_geometry (screen, monitor, &rect);
+    *width = rect.width;
+    *height = rect.height;
+  } else if (player->target == NULL) {
+    *width = -1;
+    *height = -1;
+  } else {
+    *width = player->target_rect.width;
+    *height = player->target_rect.height;
+  }
+  return TRUE;
+}
+
 static void
 swfmoz_player_get_property (GObject *object, guint param_id, GValue *value, 
     GParamSpec * pspec)
@@ -426,6 +512,18 @@
 }
 
 static void
+swfmoz_player_clear_repaints (SwfmozPlayer *player)
+{
+  if (player->repaint_source) {
+    g_source_destroy (player->repaint_source);
+    g_source_unref (player->repaint_source);
+    player->repaint_source = NULL;
+    gdk_region_destroy (player->repaint);
+    player->repaint = NULL;
+  }
+}
+
+static void
 swfmoz_player_dispose (GObject *object)
 {
   SwfmozPlayer *player = SWFMOZ_PLAYER (object);
@@ -448,17 +546,12 @@
   g_signal_handlers_disconnect_by_func (player, swfmoz_player_redraw, NULL);
   g_signal_handlers_disconnect_by_func (player, swfmoz_player_launch, NULL);
   g_signal_handlers_disconnect_by_func (player, swfmoz_player_notify, NULL);
+  g_signal_handlers_disconnect_by_func (player, swfmoz_player_query_size, NULL);
   if (player->target) {
     g_object_unref (player->target);
     player->target = NULL;
   }
-  if (player->repaint_source) {
-    g_source_destroy (player->repaint_source);
-    g_source_unref (player->repaint_source);
-    player->repaint_source = NULL;
-    gdk_region_destroy (player->repaint);
-    player->repaint = NULL;
-  }
+  swfmoz_player_clear_repaints (player);
   if (player->initial) {
     g_object_unref (player->initial);
     player->initial = NULL;
@@ -490,6 +583,7 @@
   g_signal_connect (player, "invalidate", G_CALLBACK (swfmoz_player_redraw), NULL);
   g_signal_connect (player, "launch", G_CALLBACK (swfmoz_player_launch), NULL);
   g_signal_connect (player, "notify", G_CALLBACK (swfmoz_player_notify), NULL);
+  g_signal_connect (player, "query-size", G_CALLBACK (swfmoz_player_query_size), NULL);
   player->context = g_main_context_default ();
 
   player->loaders = GTK_TREE_MODEL (gtk_list_store_new (SWFMOZ_LOADER_N_COLUMNS,
@@ -552,7 +646,7 @@
   }
 
   url = swfdec_loader_get_url (loader);
-  player = SWFMOZ_LOADER (loader)->instance->pdata;
+  player = (*SWFMOZ_LOADER (loader)->instance)->pdata;
   if (url && SWFMOZ_LOADER (loader)->initial && swfdec_player_get_variables (player)) {
     /* This auto-appends the FlashVars to the reported URL. You should be able
      * to copy/paste that URL easily without breakage that way 
@@ -654,7 +748,7 @@
 
 void
 swfmoz_player_set_target (SwfmozPlayer *player, GdkWindow *target, 
-    int x, int y, int width, int height)
+    int x, int y, int width, int height, Visual *visual)
 {
   g_return_if_fail (SWFMOZ_IS_PLAYER (player));
   g_return_if_fail (target == NULL || GDK_IS_WINDOW (target));
@@ -664,6 +758,7 @@
       g_object_unref (player->target);
     }
     player->target = target;
+    swfmoz_player_clear_repaints (player);
     if (target) {
       cairo_t *cr;
       SwfdecRenderer *renderer;
@@ -689,6 +784,7 @@
   player->target_rect.y = y;
   player->target_rect.width = width;
   player->target_rect.height = height;
+  player->target_visual = visual;
   swfdec_player_set_size (SWFDEC_PLAYER (player), width, height);
 }
 
@@ -934,6 +1030,7 @@
   swfdec_gtk_player_set_playing (SWFDEC_GTK_PLAYER (player), FALSE);
   swfdec_gtk_player_set_audio_enabled (SWFDEC_GTK_PLAYER (player), FALSE);
   swfmoz_dialog_remove (player);
+  player->instance = NULL;
   g_object_unref (player);
 }
 
diff -Nru /tmp/ytdEjdu3tT/swfdec-mozilla-0.7.4/src/swfmoz_player.h /tmp/B0O49zPrD0/swfdec-mozilla-0.8.0/src/swfmoz_player.h
--- swfdec-mozilla-0.7.4/src/swfmoz_player.h	2008-07-16 21:03:51.000000000 +0200
+++ swfdec-mozilla-0.8.0/src/swfmoz_player.h	2008-08-27 11:11:05.000000000 +0200
@@ -57,6 +57,7 @@
   gboolean		opaque;			/* TRUE if the player should not allow translucency */
   GdkWindow *		target;			/* what we draw to */
   GdkRectangle		target_rect;		/* area in target that this plugin occupies */
+  Visual *		target_visual;		/* visual for drawing */
 
   GSource *		repaint_source;		/* set when repaint is necessary */
   GdkRegion *		repaint;		/* area to repaint or NULL if none */
@@ -89,7 +90,8 @@
 						 int			x,
 						 int			y,
 						 int			width,
-						 int			height);
+						 int			height,
+						 Visual *		visual);
 void		swfmoz_player_set_allow_popups	(SwfmozPlayer *		player,
 						 gboolean		allow);
 void		swfmoz_player_render		(SwfmozPlayer *		player,