[Swfdec] 4 commits - test/swfscript.c

[Benjamin Otte]

 test/swfscript.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 20ece7c7093cd5d405f791db433249f8f62c7ad6 (from f8e4a64060ff417a740d334a5f88381145f5b498)
Author: Benjamin Otte <otte at gnome.org>
Date:   Tue Mar 13 13:35:40 2007 +0100

    Dear gcc, this variable can never be undefined, but it might be a bit hard for you to figure out why, so I've NULL'ed it for you.

diff --git a/test/swfscript.c b/test/swfscript.c
index 40d0e27..e53a3d9 100644
--- a/test/swfscript.c
+++ b/test/swfscript.c
@@ -108,7 +108,7 @@ fixup_jumps_foreach (gconstpointer bytec
       GINT16_TO_LE (jump_offset - offset - 5);
   }
   if (action == 0x8a || action == 0x8d) {
-    Action *cur;
+    Action *cur = NULL; /* silence gcc */
     guint id = action == 0x8a ? 2 : 0;
     guint i, count;
     guint offset = (guint8 *) bytecode - state->script->buffer->data;
diff-tree f8e4a64060ff417a740d334a5f88381145f5b498 (from parents)
Merge: a534df65ecfe3394800d688623315e4614488a6f f3ceb92e7405d2cef3398baa79712eaee6eeabd1
Author: Benjamin Otte <otte at gnome.org>
Date:   Tue Mar 13 12:51:53 2007 +0100

    Merge branch 'master' of ssh://company@git.freedesktop.org/git/swfdec

diff-tree a534df65ecfe3394800d688623315e4614488a6f (from parents)
Merge: 83efb5ffeb23363166d2a83bd723d1c40802f3d2 d569f40ce1d270b721fd0b1fb12ed77a512d6e74
Author: Benjamin Otte <otte at gnome.org>
Date:   Tue Mar 13 12:21:20 2007 +0100

    Merge branch 'master' of ssh://company@git.freedesktop.org/git/swfdec

diff-tree 83efb5ffeb23363166d2a83bd723d1c40802f3d2 (from 03fccd9bc1924e4e128d1d0d6454a867991fd623)
Author: Benjamin Otte <otte at gnome.org>
Date:   Sun Mar 11 23:08:53 2007 +0100

    get rid of undefined symbols
    
    It still sucks that libjs.so needs symbols from libswfdec

diff --git a/libswfdec/js/jsobj.c b/libswfdec/js/jsobj.c
index 81ac409..0f825ff 100644
--- a/libswfdec/js/jsobj.c
+++ b/libswfdec/js/jsobj.c
@@ -905,7 +905,7 @@ js_obj_toSource(JSContext *cx, JSObject 
 }
 #endif /* JS_HAS_INITIALIZERS || JS_HAS_TOSOURCE */
 
-extern const JSClass movieclip_class;
+extern int swfdec_js_is_movieclip (JSContext *cx, JSObject *obj);
 extern char *swfdec_movie_get_path (void *movieclip);
 extern void g_free (void *p);
 JSBool
@@ -921,7 +921,7 @@ js_obj_toString(JSContext *cx, JSObject 
 	*rval = STRING_TO_JSVAL(cx->runtime->emptyString);
 	return JS_TRUE;
     }
-    if (clasp == &movieclip_class) {
+    if (swfdec_js_is_movieclip (cx, obj)) {
 	void *p = JS_GetPrivate (cx, obj);
 	if (p) {
 	    char *path = swfdec_movie_get_path (p);