muine r1247 - in trunk: . libmuine

[diegoe svn gnome org]

Author: diegoe
Date: Sat Nov 29 00:46:22 2008
New Revision: 1247
URL: http://svn.gnome.org/viewvc/muine?rev=1247&view=rev

Log:
Remove gnome-vfs usage.

Closes bgo #562636.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libmuine/player-xine.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Nov 29 00:46:22 2008
@@ -52,8 +52,7 @@
 PKG_CHECK_MODULES(MUINE,
 		  gconf-2.0 \
 		  gdk-pixbuf-2.0 \
-		  gnome-vfs-2.0 \
-                  glib-2.0 >= $GLIB_REQUIRED \
+		  glib-2.0 >= $GLIB_REQUIRED \
 		  gtk+-2.0 >= $GTK_REQUIRED \
 		  gnome-icon-theme >= $ICON_THEME_REQUIRED \
 		  $audio_pkgconfig)

Modified: trunk/libmuine/player-xine.c
==============================================================================
--- trunk/libmuine/player-xine.c	(original)
+++ trunk/libmuine/player-xine.c	Sat Nov 29 00:46:22 2008
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <math.h>
 #include <xine.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
 #include <glib/gi18n.h>
 
 #include "player.h"
@@ -380,17 +379,17 @@
       switch (xine_error)
 	{
 	case XINE_ERROR_NO_INPUT_PLUGIN:
-	  unesc = gnome_vfs_unescape_string_for_display (uri);
+	  unesc = g_uri_unescape_string (uri, NULL);
 	  *error = g_strdup_printf (_("No plugin available for \"%s\""), unesc);
 	  g_free (unesc);
 	  break;
 	case XINE_ERROR_NO_DEMUX_PLUGIN:
-	  unesc = gnome_vfs_unescape_string_for_display (uri);
+	  unesc = g_uri_unescape_string (uri, NULL);
 	  *error = g_strdup_printf (_("No plugin available for \"%s\""), unesc);
 	  g_free (unesc);
 	  break;
 	case XINE_ERROR_DEMUX_FAILED:
-	  unesc = gnome_vfs_unescape_string_for_display (uri);
+	  unesc = g_uri_unescape_string (uri, NULL);
 	  *error = g_strdup_printf (_("Failed playing \"%s\""), unesc);
 	  g_free (unesc);
 	  break;
@@ -403,7 +402,7 @@
     }
   else if (!xine_get_stream_info (priv->stream, XINE_STREAM_INFO_AUDIO_HANDLED))
     {
-      unesc = gnome_vfs_unescape_string_for_display (uri);
+      unesc = g_uri_unescape_string (uri, NULL);
       *error = g_strdup_printf (_("Could not play \"%s\""), unesc);
       g_free (unesc);
       return FALSE;
@@ -447,7 +446,7 @@
 
   *error = NULL;
 
-  uri = gnome_vfs_get_uri_from_local_path (file);
+  uri = g_filename_to_uri (file, NULL, NULL);
   if (uri == NULL)
     {
       *error = g_strdup ("Failed to convert filename to URI.");