[Swfdec-commits] src/swfmoz_loader.c src/swfmoz_player.c

[Pekka Lampila]

 src/swfmoz_loader.c |   14 +++++---------
 src/swfmoz_player.c |   14 +++++---------
 2 files changed, 10 insertions(+), 18 deletions(-)

New commits:
commit 76b3bbdc72cbe893f339422f14f5b7f21c9303d3
Author: Pekka Lampila <pekka.lampila at iki.fi>
Date:   Thu May 29 15:26:25 2008 +0300

    Changes required by the removal of SwfdecLoaderRequest in the library

diff --git a/src/swfmoz_loader.c b/src/swfmoz_loader.c
index 433e0de..4fa2b22 100644
--- a/src/swfmoz_loader.c
+++ b/src/swfmoz_loader.c
@@ -48,8 +48,8 @@ swfmoz_loader_dispose (GObject *object)
 }
 
 static void
-swfmoz_loader_load (SwfdecLoader *loader, SwfdecPlayer *player, 
-    const char *url, SwfdecLoaderRequest request, SwfdecBuffer *buffer)
+swfmoz_loader_load (SwfdecLoader *loader, SwfdecPlayer *player,
+    const char *url, SwfdecBuffer *buffer)
 {
   SwfmozPlayer *mozplay = SWFMOZ_PLAYER (player);
   SwfmozLoader *moz = SWFMOZ_LOADER (loader);
@@ -61,13 +61,9 @@ swfmoz_loader_load (SwfdecLoader *loader, SwfdecPlayer *player,
     mozplay->initial = NULL;
   } else {
     g_object_ref (moz);
-    if (request == SWFDEC_LOADER_REQUEST_POST) {
-      if (buffer) {
-	plugin_post_url_notify (moz->instance, url, NULL, 
-	    (char *) buffer->data, buffer->length, moz);
-      } else {
-	plugin_post_url_notify (moz->instance, url, NULL, NULL, 0, moz);
-      }
+    if (buffer) {
+      plugin_post_url_notify (moz->instance, url, NULL, (char *)buffer->data,
+	  buffer->length, moz);
     } else {
       plugin_get_url_notify (moz->instance, url, NULL, moz);
     }
diff --git a/src/swfmoz_player.c b/src/swfmoz_player.c
index c27fcbe..a6aa801 100644
--- a/src/swfmoz_player.c
+++ b/src/swfmoz_player.c
@@ -210,16 +210,12 @@ swfmoz_player_redraw (SwfmozPlayer *player, const SwfdecRectangle *extents,
 }
 
 static void
-swfmoz_player_launch (SwfmozPlayer *player, SwfdecLoaderRequest request, 
-    const char *url, const char *target, SwfdecBuffer *data, gpointer unused)
+swfmoz_player_launch (SwfmozPlayer *player, const char *url,
+    const char *target, SwfdecBuffer *data, gpointer unused)
 {
-  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);
-    }
+  if (data) {
+    plugin_post_url (player->instance, url, target, (const char *)data->data,
+	data->length);
   } else {
     plugin_get_url (player->instance, url, target);
   }