[Swfdec] 2 commits - configure.ac libswfdec/swfdec_loader_internal.h player/swfplay.c

[Benjamin Otte]

 configure.ac                       |    3 ---
 libswfdec/swfdec_loader_internal.h |    1 +
 player/swfplay.c                   |   10 ++++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
diff-tree a2d36ad31bc38cf1092f08fbded125afe22534e1 (from 0abbfb2a016eaf56cb5562ecd6921edecedbd9ae)
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri May 4 21:23:02 2007 -0400

    Fix compilation with gnome-vfs disabled

diff --git a/libswfdec/swfdec_loader_internal.h b/libswfdec/swfdec_loader_internal.h
index 303088a..028f868 100644
--- a/libswfdec/swfdec_loader_internal.h
+++ b/libswfdec/swfdec_loader_internal.h
@@ -47,6 +47,7 @@ struct _SwfdecFileLoaderClass
   SwfdecLoaderClass   	loader_class;
 };
 
+GType			swfdec_file_loader_get_type	(void);
 
 SwfdecLoader *		swfdec_loader_load		(SwfdecLoader *		loader,
 							 const char *		url);
diff --git a/player/swfplay.c b/player/swfplay.c
index 7cc4dbe..0c2e062 100644
--- a/player/swfplay.c
+++ b/player/swfplay.c
@@ -79,7 +79,6 @@ main (int argc, char *argv[])
   gboolean trace = FALSE;
   char *variables = NULL;
   GtkWidget *window;
-  char *s;
 
   GOptionEntry options[] = {
     { "delay", 'd', 0, G_OPTION_ARG_INT, &delay, "make loading of resources take time", "SECS" },
@@ -114,9 +113,12 @@ main (int argc, char *argv[])
   }
 
 #if HAVE_GNOMEVFS
-  s = gnome_vfs_make_uri_from_shell_arg (argv[1]);
-  loader = swfdec_gtk_loader_new (s);
-  g_free (s);
+  {
+    char *s;
+    s = gnome_vfs_make_uri_from_shell_arg (argv[1]);
+    loader = swfdec_gtk_loader_new (s);
+    g_free (s);
+  }
 #else
   loader = swfdec_gtk_loader_new (argv[1]);
 #endif
diff-tree 0abbfb2a016eaf56cb5562ecd6921edecedbd9ae (from ee9dd4ff79d598316c0e97222ef3aac8be4688e7)
Author: Benjamin Otte <otte at gnome.org>
Date:   Fri May 4 15:49:21 2007 -0400

    We want an error when Gtk isn't available, but enabled.

diff --git a/configure.ac b/configure.ac
index 00ecaab..932aec1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,9 +96,6 @@ GTK_VER=2.8.0
 AC_SUBST(GTK_VER)
 if test "$enable_gtk" = "yes"; then
 	PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_VER, HAVE_GTK=yes, HAVE_GTK=no)
-	if test "$HAVE_GTK" = "no"; then
-	  AC_MSG_WARN([cannot find GTK+-2.0, player will be disabled])
-	fi
 	if test "x$HAVE_GTK" = xyes; then
 	  AC_DEFINE(HAVE_GTK, 1, [Define if Gtk is enabled])
 	else