Mailinglist Archive: opensuse-commit (689 mails)
| < Previous | Next > |
commit swfdec-mozilla
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 19 Dec 2007 01:06:26 +0100
- Message-id: <20071219000627.0C2D7678168@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package swfdec-mozilla
checked in at Wed Dec 19 01:06:26 CET 2007.
--------
--- swfdec-mozilla/swfdec-mozilla.changes 2007-11-14 17:18:15.000000000
+0100
+++ /mounts/work_src_done/STABLE/swfdec-mozilla/swfdec-mozilla.changes
2007-12-18 23:30:51.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Dec 18 23:30:42 CET 2007 - meissner@xxxxxxx
+
+- upgraded to 0.5.5
+ - add FutureSplash mime type
+ - update API to match Swfdec
+ - some serious bugs fixed
+
+-------------------------------------------------------------------
Old:
----
swfdec-mozilla-0.5.3.tar.bz2
New:
----
swfdec-mozilla-0.5.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ swfdec-mozilla.spec ++++++
--- /var/tmp/diff_new_pack.Q10725/_old 2007-12-19 01:05:29.000000000 +0100
+++ /var/tmp/diff_new_pack.Q10725/_new 2007-12-19 01:05:29.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package swfdec-mozilla (Version 0.5.3)
+# spec file for package swfdec-mozilla (Version 0.5.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -19,7 +19,7 @@
Group: Productivity/Networking/Web/Browsers
AutoReqProv: on
Summary: browser plugin for swfdec
-Version: 0.5.3
+Version: 0.5.5
Release: 1
Source0:
http://swfdec.freedesktop.org/download/swfdec-mozilla/0.5/%name-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -59,7 +59,13 @@
%defattr(-, root, root)
%doc COPYING NEWS README
%{_libdir}/browser-plugins/lib*
+
%changelog
+* Tue Dec 18 2007 - meissner@xxxxxxx
+- upgraded to 0.5.5
+ - add FutureSplash mime type
+ - update API to match Swfdec
+ - some serious bugs fixed
* Wed Nov 14 2007 - meissner@xxxxxxx
- upgraded to 0.5.3
- lots of bugfixes
++++++ swfdec-mozilla-0.5.3.tar.bz2 -> swfdec-mozilla-0.5.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/configure
new/swfdec-mozilla-0.5.5/configure
--- old/swfdec-mozilla-0.5.3/configure 2007-10-12 17:11:14.000000000 +0200
+++ new/swfdec-mozilla-0.5.5/configure 2007-12-17 21:05:10.000000000 +0100
@@ -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.5.3.
+# Generated by GNU Autoconf 2.61 for swfdec-mozilla 0.5.5.
#
# 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.5.3'
-PACKAGE_STRING='swfdec-mozilla 0.5.3'
+PACKAGE_VERSION='0.5.5'
+PACKAGE_STRING='swfdec-mozilla 0.5.5'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -1403,7 +1403,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.5.3 to adapt to many kinds of systems.
+\`configure' configures swfdec-mozilla 0.5.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1473,7 +1473,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of swfdec-mozilla 0.5.3:";;
+ short | recursive ) echo "Configuration of swfdec-mozilla 0.5.5:";;
esac
cat <<\_ACEOF
@@ -1582,7 +1582,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-swfdec-mozilla configure 0.5.3
+swfdec-mozilla configure 0.5.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1596,7 +1596,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.5.3, which was
+It was created by swfdec-mozilla $as_me 0.5.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2294,7 +2294,7 @@
# Define the identity of the package.
PACKAGE='swfdec-mozilla'
- VERSION='0.5.3'
+ VERSION='0.5.5'
cat >>confdefs.h <<_ACEOF
@@ -21388,7 +21388,7 @@
-SWFDEC_REQUIRES=0.5.3
+SWFDEC_REQUIRES=0.5.5
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -21519,12 +21519,12 @@
pkg_cv_SWFDEC_CFLAGS="$SWFDEC_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"swfdec-gtk-\$SWFDEC_MAJORMINOR = \$SWFDEC_REQUIRES\"") >&5
- ($PKG_CONFIG --exists --print-errors "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 "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
@@ -21537,12 +21537,12 @@
pkg_cv_SWFDEC_LIBS="$SWFDEC_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"swfdec-gtk-\$SWFDEC_MAJORMINOR = \$SWFDEC_REQUIRES\"") >&5
- ($PKG_CONFIG --exists --print-errors "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 "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
@@ -21561,9 +21561,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 "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 "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
@@ -22055,7 +22055,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.5.3, which was
+This file was extended by swfdec-mozilla $as_me 0.5.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22108,7 +22108,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-swfdec-mozilla config.status 0.5.3
+swfdec-mozilla config.status 0.5.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/configure.ac
new/swfdec-mozilla-0.5.5/configure.ac
--- old/swfdec-mozilla-0.5.3/configure.ac 2007-10-12 17:10:58.000000000
+0200
+++ new/swfdec-mozilla-0.5.5/configure.ac 2007-12-17 21:04:58.000000000
+0100
@@ -1,5 +1,5 @@
AC_PREREQ([2.58])
-AC_INIT(swfdec-mozilla,0.5.3)
+AC_INIT(swfdec-mozilla,0.5.5)
[nano=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9]\.[0-9][0-9]*\.*//')]
if test x"$nano" = x1 ; then
@@ -57,8 +57,8 @@
dnl Check for essential libraries first:
dnl ====================================
-SWFDEC_REQUIRES=0.5.3
-PKG_CHECK_MODULES(SWFDEC, swfdec-gtk-$SWFDEC_MAJORMINOR = $SWFDEC_REQUIRES,
HAVE_SWFDEC=yes, HAVE_SWFDEC=no)
+SWFDEC_REQUIRES=0.5.5
+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 -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/MAINTAINERS
new/swfdec-mozilla-0.5.5/MAINTAINERS
--- old/swfdec-mozilla-0.5.3/MAINTAINERS 1970-01-01 01:00:00.000000000
+0100
+++ new/swfdec-mozilla-0.5.5/MAINTAINERS 2007-11-14 23:34:38.000000000
+0100
@@ -0,0 +1,4 @@
+Benjamin Otte
+E-mail: otte@xxxxxxxxx
+Userid: otte
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/Makefile.am
new/swfdec-mozilla-0.5.5/Makefile.am
--- old/swfdec-mozilla-0.5.3/Makefile.am 2007-08-03 21:59:37.000000000
+0200
+++ new/swfdec-mozilla-0.5.5/Makefile.am 2007-11-14 23:34:47.000000000
+0100
@@ -8,6 +8,7 @@
depcomp \
AUTHORS \
COPYING \
+ MAINTAINERS \
README \
ChangeLog \
autogen.sh \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/Makefile.in
new/swfdec-mozilla-0.5.5/Makefile.in
--- old/swfdec-mozilla-0.5.3/Makefile.in 2007-10-12 17:11:13.000000000
+0200
+++ new/swfdec-mozilla-0.5.5/Makefile.in 2007-12-17 21:05:10.000000000
+0100
@@ -196,6 +196,7 @@
depcomp \
AUTHORS \
COPYING \
+ MAINTAINERS \
README \
ChangeLog \
autogen.sh \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/NEWS new/swfdec-mozilla-0.5.5/NEWS
--- old/swfdec-mozilla-0.5.3/NEWS 2007-10-12 16:55:13.000000000 +0200
+++ new/swfdec-mozilla-0.5.5/NEWS 2007-12-17 21:04:35.000000000 +0100
@@ -1,4 +1,16 @@
+ 0.5.5 ("Reading is lame")
+
+New release:
+- update API for new version
+
+ 0.5.4 ("Ultravibe Pleasure 2000")
+
+This release brings some stabiliy improvements.
+- add FutureSplash mime type
+- update API to match Swfdec
+- some serious bugs fixed
+
0.5.3 ("I like Hello Kitty Island Adventure a lot more than this stuff")
Another release of Swfdec, another release of the plugin.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/README
new/swfdec-mozilla-0.5.5/README
--- old/swfdec-mozilla-0.5.3/README 2007-08-03 21:59:37.000000000 +0200
+++ new/swfdec-mozilla-0.5.5/README 2007-11-29 10:02:44.000000000 +0100
@@ -19,14 +19,9 @@
browsers by adding /usr/local/lib/mozilla/plugins to the
MOZ_PLUGIN_PATH environment variable.
- - Sound output is provided by libswfdec-gtk. It is currently only
- available for ALSA. If you want a different output, feel
- encouraged to provide patches.
-
Dependencies:
- swfdec (= 0.4.4)
- swfdec-gtk (= 0.4.4)
- Mozilla (>= 1.0.0)
+ swfdec (= 0.5.4)
+ swfdec-gtk (= 0.5.4)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/src/Makefile.am
new/swfdec-mozilla-0.5.5/src/Makefile.am
--- old/swfdec-mozilla-0.5.3/src/Makefile.am 2007-08-03 21:59:37.000000000
+0200
+++ new/swfdec-mozilla-0.5.5/src/Makefile.am 2007-11-06 21:24:13.000000000
+0100
@@ -2,10 +2,11 @@
plugin_LTLIBRARIES = libswfdecmozilla.la
libswfdecmozilla_la_CFLAGS = $(GLOBAL_CFLAGS) $(MOZILLA_CFLAGS)
$(SWFDEC_CFLAGS) \
- $(AUDIO_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+ -DPLUGIN_DIR=\""$(PLUGIN_DIR)"\"
+
libswfdecmozilla_la_LDFLAGS = \
-module -avoid-version -export-symbols $(srcdir)/plugin.symbols \
- $(SWFDEC_LIBS) $(AUDIO_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
+ $(SWFDEC_LIBS)
libswfdecmozilla_la_SOURCES = \
plugin.c \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/src/Makefile.in
new/swfdec-mozilla-0.5.5/src/Makefile.in
--- old/swfdec-mozilla-0.5.3/src/Makefile.in 2007-10-12 17:11:13.000000000
+0200
+++ new/swfdec-mozilla-0.5.5/src/Makefile.in 2007-12-17 21:05:09.000000000
+0100
@@ -201,11 +201,11 @@
plugindir = $(PLUGIN_DIR)
plugin_LTLIBRARIES = libswfdecmozilla.la
libswfdecmozilla_la_CFLAGS = $(GLOBAL_CFLAGS) $(MOZILLA_CFLAGS)
$(SWFDEC_CFLAGS) \
- $(AUDIO_CFLAGS) $(CAIRO_CFLAGS) $(GTK_CFLAGS)
+ -DPLUGIN_DIR=\""$(PLUGIN_DIR)"\"
libswfdecmozilla_la_LDFLAGS = \
-module -avoid-version -export-symbols $(srcdir)/plugin.symbols \
- $(SWFDEC_LIBS) $(AUDIO_LIBS) $(CAIRO_LIBS) $(GTK_LIBS)
+ $(SWFDEC_LIBS)
libswfdecmozilla_la_SOURCES = \
plugin.c \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/src/plugin.c
new/swfdec-mozilla-0.5.5/src/plugin.c
--- old/swfdec-mozilla-0.5.3/src/plugin.c 2007-09-14 22:00:30.000000000
+0200
+++ new/swfdec-mozilla-0.5.5/src/plugin.c 2007-11-14 18:05:24.000000000
+0100
@@ -53,6 +53,14 @@
}
void
+plugin_post_url (NPP instance, const char *url,
+ const char *target, const char *data, guint data_len)
+{
+ CallNPN_PostURLProc (mozilla_funcs.posturl, instance,
+ url, target, data_len, data ? data : "", FALSE);
+}
+
+void
plugin_post_url_notify (NPP instance, const char *url,
const char *target, const char *data, guint data_len, void *user_data)
{
@@ -89,7 +97,7 @@
char *
NP_GetMIMEDescription (void)
{
- return "application/x-shockwave-flash:.swf:Adobe Flash movie";
+ return "application/x-shockwave-flash:swf:Adobe Flash
movie;application/futuresplash:spl:FutureSplash movie";
}
NPError
@@ -120,6 +128,34 @@
return NPERR_NO_ERROR;
}
+/* This mess is unfortunately necessary */
+#define PLUGIN_FILE PLUGIN_DIR G_DIR_SEPARATOR_S "libswfdecmozilla."
G_MODULE_SUFFIX
+G_MODULE_EXPORT gboolean
+swfdec_mozilla_make_sure_this_thing_stays_in_memory (void)
+{
+ static gboolean inited = FALSE;
+ GModule *module;
+ gpointer check;
+
+ if (inited)
+ return TRUE;
+ if (!g_module_supported ())
+ return FALSE;
+ module = g_module_open (PLUGIN_FILE, 0);
+ if (module == NULL)
+ return FALSE;
+ /* now load this function name to be sure it we've loaded ourselves */
+ if (!g_module_symbol (module,
"swfdec_mozilla_make_sure_this_thing_stays_in_memory", &check) ||
+ check != swfdec_mozilla_make_sure_this_thing_stays_in_memory) {
+ g_module_close (module);
+ return FALSE;
+ }
+ g_module_make_resident (module);
+ g_module_close (module);
+ inited = TRUE;
+ return TRUE;
+}
+
static NPError
plugin_new (NPMIMEType mime_type, NPP instance,
uint16_t mode, int16_t argc, char *argn[], char *argv[],
@@ -130,9 +166,12 @@
if (instance == NULL)
return NPERR_INVALID_INSTANCE_ERROR;
- if (CallNPN_SetValueProc (mozilla_funcs.setvalue, instance,
- NPPVpluginKeepLibraryInMemory, (void *) PR_TRUE))
- return NPERR_INCOMPATIBLE_VERSION_ERROR;
+ if (!swfdec_mozilla_make_sure_this_thing_stays_in_memory ()) {
+ g_printerr ("Ensuring the plugin stays in memory did not work.\n"
+ "This happens when the plugin was copied from its installed
location at " PLUGIN_FILE ".\n"
+ "Please use the --with-plugin-dir configure option to install
it into a different place.\n");
+ return NPERR_INVALID_INSTANCE_ERROR;
+ }
#if 0
/* see https://bugzilla.mozilla.org/show_bug.cgi?id=137189 for why this
doesn't work
* probably needs user agent sniffing to make this work correctly (iff gecko
@@ -221,7 +260,9 @@
if (instance == NULL || !SWFMOZ_IS_PLAYER (instance->pdata))
return NPERR_INVALID_INSTANCE_ERROR;
+ plugin_x11_teardown (instance->pdata);
swfmoz_player_remove (instance->pdata);
+ instance->pdata = NULL;
return NPERR_NO_ERROR;
}
@@ -396,7 +437,7 @@
NPError
NP_Shutdown (void)
{
- g_printerr ("You should not see this text until you've closed your
browser\n");
+ /* Haha, we stay in memory anyway, no way to get rid of us! */
return NPERR_NO_ERROR;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/src/plugin.h
new/swfdec-mozilla-0.5.5/src/plugin.h
--- old/swfdec-mozilla-0.5.3/src/plugin.h 2007-08-08 11:10:43.000000000
+0200
+++ new/swfdec-mozilla-0.5.5/src/plugin.h 2007-10-18 23:17:17.000000000
+0200
@@ -33,6 +33,11 @@
const char * url,
const char * target,
void * data);
+void plugin_post_url (NPP instance,
+ const char * url,
+ const char * target,
+ const char * data,
+ guint data_len);
void plugin_post_url_notify (NPP instance,
const char * url,
const char * target,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/src/plugin.symbols
new/swfdec-mozilla-0.5.5/src/plugin.symbols
--- old/swfdec-mozilla-0.5.3/src/plugin.symbols 2007-08-03 21:59:37.000000000
+0200
+++ new/swfdec-mozilla-0.5.5/src/plugin.symbols 2007-11-06 22:34:54.000000000
+0100
@@ -2,3 +2,4 @@
NP_GetValue
NP_Initialize
NP_Shutdown
+swfdec_mozilla_make_sure_this_thing_stays_in_memory
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/src/plugin_x11.c
new/swfdec-mozilla-0.5.5/src/plugin_x11.c
--- old/swfdec-mozilla-0.5.3/src/plugin_x11.c 2007-10-10 21:50:11.000000000
+0200
+++ new/swfdec-mozilla-0.5.5/src/plugin_x11.c 2007-11-29 11:15:17.000000000
+0100
@@ -53,11 +53,15 @@
break;
}
case ButtonPress:
+ {
+ XButtonEvent *button = (XButtonEvent *) event;
+ swfmoz_player_mouse_press (player, button->x, button->y,
button->button);
+ break;
+ }
case ButtonRelease:
{
XButtonEvent *button = (XButtonEvent *) event;
- swfmoz_player_mouse_changed (player, button->button, button->x,
- button->y, event->type == ButtonPress);
+ swfmoz_player_mouse_release (player, button->x, button->y,
button->button);
break;
}
case EnterNotify:
@@ -69,7 +73,7 @@
int winx, winy;
gdk_window_get_pointer (player->target, &winx, &winy, NULL);
- swfmoz_player_mouse_moved (player, winx, winy);
+ swfmoz_player_mouse_move (player, winx, winy);
break;
}
case KeyPress:
@@ -94,6 +98,13 @@
}
break;
}
+ case ConfigureNotify:
+ {
+ XConfigureEvent *conf = (XConfigureEvent *) event;
+
+ swfmoz_player_set_target (player, player->target, 0, 0, conf->width,
conf->height);
+ break;
+ }
default:
g_printerr ("unhandled event %d\n", event->type);
break;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/src/swfmoz_player.c
new/swfdec-mozilla-0.5.5/src/swfmoz_player.c
--- old/swfdec-mozilla-0.5.3/src/swfmoz_player.c 2007-10-10
22:00:20.000000000 +0200
+++ new/swfdec-mozilla-0.5.5/src/swfmoz_player.c 2007-11-29
11:13:39.000000000 +0100
@@ -69,8 +69,16 @@
"Eric Anholt <eric@xxxxxxxxxx>",
NULL,
};
+ static const char *artists[] = {
+ "Andreas Nilsson <andreas@xxxxxxxxxxx>",
+ "Cristian Grada <krigenator@xxxxxxxxx>",
+ NULL
+ };
+
gtk_show_about_dialog (NULL, "program-name", "Swfdec",
+ "logo-icon-name", "swfdec",
"authors", authors,
+ "artists", artists,
"comments", "Play Flash content in your browser",
"name", "Swfdec Mozilla Plugin",
"version", VERSION,
@@ -201,10 +209,19 @@
}
static void
-swfmoz_player_launch (SwfdecPlayer *swfplayer, const char *url, const char
*target,
- SwfmozPlayer *player)
+swfmoz_player_launch (SwfdecPlayer *swfplayer, SwfdecLoaderRequest request,
+ const char *url, const char *target, SwfdecBuffer *data, SwfmozPlayer
*player)
{
- plugin_get_url (player->instance, url, target);
+ if (request == SWFDEC_LOADER_REQUEST_POST) {
+ if (data) {
+ plugin_post_url (player->instance, url, target,
+ (const char *) data->data, data->length);
+ } else {
+ plugin_post_url (player->instance, url, target, NULL, 0);
+ }
+ } else {
+ plugin_get_url (player->instance, url, target);
+ }
}
static void
@@ -384,22 +401,29 @@
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);
}
@@ -464,7 +488,7 @@
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);
@@ -602,41 +626,63 @@
}
gboolean
-swfmoz_player_mouse_changed (SwfmozPlayer *player, int button, int x, int y,
gboolean down)
+swfmoz_player_mouse_press (SwfmozPlayer *player, int x, int y, guint button)
{
+ gboolean ret = FALSE;
+
g_return_val_if_fail (SWFMOZ_IS_PLAYER (player), FALSE);
- switch (button) {
- case 1:
- if (!swfdec_gtk_player_get_playing (SWFDEC_GTK_PLAYER (player->player)))
{
- if (!down)
- return FALSE;
- swfdec_gtk_player_set_playing (SWFDEC_GTK_PLAYER (player->player),
TRUE);
- } else {
- player->mouse_down = down;
- plugin_push_allow_popups (player->instance, TRUE);
- swfdec_player_handle_mouse (player->player, x, y, down ? 1 : 0);
- plugin_pop_allow_popups (player->instance);
- }
- return TRUE;
- case 3:
- if (!down) {
- swfmoz_player_popup_menu (player);
- return TRUE;
- }
- default:
- break;
+ if (button > 32)
+ return FALSE;
+
+ if (player->menu && GTK_WIDGET_VISIBLE (player->menu))
+ gtk_menu_popdown (GTK_MENU (player->menu));
+
+ if (swfdec_gtk_player_get_playing (SWFDEC_GTK_PLAYER (player->player))) {
+ plugin_push_allow_popups (player->instance, TRUE);
+ ret = swfdec_player_mouse_press (player->player, x, y, button);
+ plugin_pop_allow_popups (player->instance);
}
- return FALSE;
+ return ret;
+}
+
+gboolean
+swfmoz_player_mouse_release (SwfmozPlayer *player, int x, int y, guint button)
+{
+ gboolean ret;
+
+ g_return_val_if_fail (SWFMOZ_IS_PLAYER (player), FALSE);
+
+ if (button > 32)
+ return FALSE;
+
+ if (swfdec_gtk_player_get_playing (SWFDEC_GTK_PLAYER (player->player))) {
+ plugin_push_allow_popups (player->instance, TRUE);
+ ret = swfdec_player_mouse_release (player->player, x, y, button);
+ plugin_pop_allow_popups (player->instance);
+ } else {
+ if (button == 1) {
+ swfdec_gtk_player_set_playing (SWFDEC_GTK_PLAYER (player->player), TRUE);
+ ret = TRUE;
+ } else {
+ ret = FALSE;
+ }
+ }
+
+ if (button == 3) {
+ swfmoz_player_popup_menu (player);
+ ret = TRUE;
+ }
+ return ret;
}
gboolean
-swfmoz_player_mouse_moved (SwfmozPlayer *player, int x, int y)
+swfmoz_player_mouse_move (SwfmozPlayer *player, int x, int y)
{
g_return_val_if_fail (SWFMOZ_IS_PLAYER (player), FALSE);
if (swfdec_gtk_player_get_playing (SWFDEC_GTK_PLAYER (player->player))) {
- swfdec_player_handle_mouse (player->player, x, y, player->mouse_down ? 1 :
0);
+ swfdec_player_mouse_move (player->player, x, y);
}
return FALSE;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/swfdec-mozilla-0.5.3/src/swfmoz_player.h
new/swfdec-mozilla-0.5.5/src/swfmoz_player.h
--- old/swfdec-mozilla-0.5.3/src/swfmoz_player.h 2007-10-10
21:37:00.000000000 +0200
+++ new/swfdec-mozilla-0.5.5/src/swfmoz_player.h 2007-11-29
11:14:19.000000000 +0100
@@ -59,7 +59,6 @@
gboolean windowless; /* TRUE if player communicates
with the windowing system via the browser */
GdkWindow * target; /* what we draw to */
GdkRectangle target_rect; /* area in target that this
plugin occupies */
- gboolean mouse_down; /* saved state for the mouse */
/* for windowed operation */
GSource * repaint_source; /* set when repaint is
necessary */
@@ -90,12 +89,15 @@
int height);
void swfmoz_player_render (SwfmozPlayer * player,
GdkRegion * region);
-gboolean swfmoz_player_mouse_changed (SwfmozPlayer * player,
- int button,
+gboolean swfmoz_player_mouse_press (SwfmozPlayer * player,
int x,
int y,
- gboolean down);
-gboolean swfmoz_player_mouse_moved (SwfmozPlayer * player,
+ guint button);
+gboolean swfmoz_player_mouse_release (SwfmozPlayer * player,
+ int x,
+ int y,
+ guint button);
+gboolean swfmoz_player_mouse_move (SwfmozPlayer * player,
int x,
int y);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |