summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2007-10-18 13:17:25 +0200
committerBenjamin Otte <otte@gnome.org>2007-10-18 13:17:25 +0200
commit2584f8940d5e780ed0a9d970a1eaa388c6988250 (patch)
treecca2d9799c8556a4179be23684cdc95c5e3b618c
parent7e9288880f2a1b51688308dee1e9226617aee64a (diff)
disable merging of Flash securities
-rw-r--r--libswfdec/swfdec_flash_security.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/libswfdec/swfdec_flash_security.c b/libswfdec/swfdec_flash_security.c
index f739d27d..8d1171ed 100644
--- a/libswfdec/swfdec_flash_security.c
+++ b/libswfdec/swfdec_flash_security.c
@@ -37,15 +37,8 @@ swfdec_flash_security_allow (SwfdecSecurity *guard, SwfdecSecurity *key)
} else if (SWFDEC_IS_SECURITY_ALLOW (key)) {
return g_object_ref (guard);
} else if (SWFDEC_IS_FLASH_SECURITY (key)) {
- SwfdecFlashSecurity *fguard, *fkey, *ret;
- fguard = SWFDEC_FLASH_SECURITY (guard);
- fkey = SWFDEC_FLASH_SECURITY (key);
-
- SWFDEC_FIXME ("merging flash securities - this should create the right type");
- ret = g_object_new (SWFDEC_TYPE_FLASH_SECURITY, NULL);
- ret->allow_local = fguard->allow_local && fkey->allow_local;
- ret->allow_remote = fguard->allow_remote && fkey->allow_remote;
- return SWFDEC_SECURITY (ret);
+ SWFDEC_FIXME ("merging flash securities - how is this supposed to work?");
+ return key;
} else {
SWFDEC_ERROR ("unknown security %s, denying access", G_OBJECT_TYPE_NAME (key));
return NULL;