[Swfdec-commits] 3 commits - src/plugin.c

[Benjamin Otte]

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

New commits:
commit d8aa1c238403971b01243db3eeb6e1354ec0d960
Merge: b509c65... 11bfe82...
Author: Benjamin Otte <otte at gnome.org>
Date:   Thu Nov 5 23:32:10 2009 +0100

    Merge branch '0.8'
    
    Conflicts:
    	configure.ac

commit 11bfe822fc16a06d8eacacd36a069ccf9dbc1201
Author: 李智豪 <zhihaoli.scut at gmail.com>
Date:   Thu Nov 5 23:30:21 2009 +0100

    Read correct argument when parsing alignment

diff --git a/src/plugin.c b/src/plugin.c
index 857d733..9a50cdc 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -289,7 +289,7 @@ plugin_new (NPMIMEType mime_type, NPP instance,
       guint j;
 
       for (j = 0; j < G_N_ELEMENTS (possibilities); j++) {
-	if (g_ascii_strcasecmp (argv[j], possibilities[j].name) == 0) {
+	if (g_ascii_strcasecmp (argv[i], possibilities[j].name) == 0) {
 	  align = possibilities[j].align;
 	  break;
 	}
commit f36ebd77f3b828cacf6a96829d237f47da61dfdc
Author: Benjamin Otte <otte at gnome.org>
Date:   Thu Oct 23 23:23:23 2008 +0200

    back to development

diff --git a/configure.ac b/configure.ac
index be90ea5..d6ad94f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.58])
-AC_INIT(swfdec-mozilla,0.8.2)
+AC_INIT(swfdec-mozilla,0.8.3)
 
 [SWFDEC_DEVEL=$(echo $PACKAGE_VERSION | sed 's/[0-9]\.[0-9][0-9]*\.[0-9]*[13579]/yes/')]