[totem/gnome-3-8] backend: Use GIO directly rather than through FUSE



commit d55e2375be2bada2bd4004eaaa9086af25b3de76
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Apr 4 19:58:57 2013 +0200

    backend: Use GIO directly rather than through FUSE
    
    Working around bugs in gvfs by using FUSE worked, but the crasher
    bugs so easily triggered by seeking are now fixed.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=697297

 src/backend/bacon-video-widget.c |   25 ++++---------------------
 1 files changed, 4 insertions(+), 21 deletions(-)
---
diff --git a/src/backend/bacon-video-widget.c b/src/backend/bacon-video-widget.c
index 123701e..61ce3aa 100644
--- a/src/backend/bacon-video-widget.c
+++ b/src/backend/bacon-video-widget.c
@@ -3446,7 +3446,6 @@ bacon_video_widget_open (BaconVideoWidget *bvw,
                          const char       *mrl)
 {
   GFile *file;
-  char *path;
 
   g_return_if_fail (mrl != NULL);
   g_return_if_fail (BACON_IS_VIDEO_WIDGET (bvw));
@@ -3462,28 +3461,12 @@ bacon_video_widget_open (BaconVideoWidget *bvw,
   /* this allows non-URI type of files in the thumbnailer and so on */
   file = g_file_new_for_commandline_arg (mrl);
 
-  /* Only use the URI when FUSE isn't available for a file
-   * or we're trying to read from an archive or ObexFTP */
-  if (g_file_has_uri_scheme (file, "archive") != FALSE ||
-      g_file_has_uri_scheme (file, "obex") != FALSE ||
-      g_file_has_uri_scheme (file, "ftp") != FALSE) {
-    path = NULL;
-  } else if (g_file_has_uri_scheme (file, "trash") != FALSE ||
-           g_file_has_uri_scheme (file, "recent") != FALSE) {
-    path = NULL;
+  if (g_file_has_uri_scheme (file, "trash") != FALSE ||
+      g_file_has_uri_scheme (file, "recent") != FALSE) {
     bvw->priv->mrl = get_target_uri (file);
-    if (bvw->priv->mrl == NULL)
-      path = g_file_get_path (file);
-    else
-      GST_DEBUG ("Found target location '%s' for original MRL '%s'",
-                GST_STR_NULL (bvw->priv->mrl), mrl);
+    GST_DEBUG ("Found target location '%s' for original MRL '%s'",
+              GST_STR_NULL (bvw->priv->mrl), mrl);
   } else {
-    path = g_file_get_path (file);
-  }
-  if (path) {
-    bvw->priv->mrl = g_filename_to_uri (path, NULL, NULL);
-    g_free (path);
-  } else if (bvw->priv->mrl == NULL) {
     bvw->priv->mrl = g_strdup (mrl);
   }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]