Include "config.h" instead of <config.h> Command used: find -name

[platform/upstream/glib.git] / gio / gvfs.c

diff --git a/gio/gvfs.c b/gio/gvfs.c
index 8f69191..3158d3d 100644 (file)
--- a/gio/gvfs.c
+++ b/gio/gvfs.c
@@ -20,11 +20,11 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
-#include <config.h>
+#include "config.h"
 #include <string.h>
 #include "gvfs.h"
 #include "glocalvfs.h"
-#include "giomodule.h"
+#include "giomodule-priv.h"
 #include "glibintl.h"
 
 #include "gioalias.h"
@@ -32,7 +32,7 @@
 /**
  * SECTION:gvfs
  * @short_description: Virtual File System 
- * @include: gio/gvfs.h
+ * @include: gio/gio.h
  * 
  * Entry point for using GIO functionality.
  *
@@ -167,80 +167,51 @@ g_vfs_parse_name (GVfs       *vfs,
   return (* class->parse_name) (vfs, parse_name);
 }
 
-/* Note: This compares in reverse order.
-   Higher prio -> sort first
- */
-static gint
-compare_vfs_type (gconstpointer  a,
-                 gconstpointer  b,
-                 gpointer       user_data)
-{
-  GVfsClass *class_a, *class_b;
-  gint res;
-  const char *use_this_vfs;
-  
-  class_a = g_type_class_ref (*(GType *)a);
-  class_b = g_type_class_ref (*(GType *)b);
-  use_this_vfs = user_data;
-
-  if (class_a == class_b)
-    res = 0;
-  else if (use_this_vfs != NULL &&
-          strcmp (class_a->name, use_this_vfs) == 0)
-    res = -1;
-  else if (use_this_vfs != NULL &&
-          strcmp (class_b->name, use_this_vfs) == 0)
-    res = 1;
-  else 
-    res = class_b->priority - class_a->priority;
-  
-  g_type_class_unref (class_a);
-  g_type_class_unref (class_b);
-  
-  return res;
-}
-
-
 static gpointer
 get_default_vfs (gpointer arg)
 {
-  volatile GType local_type;
-  GType *vfs_impls;
-  int i;
-  guint n_vfs_impls;
   const char *use_this;
   GVfs *vfs;
-  GType (*casted_get_type)(void);
+  GList *l;
+  GIOExtensionPoint *ep;
+  GIOExtension *extension;
+  
 
   use_this = g_getenv ("GIO_USE_VFS");
   
-  /* Ensure GLocalVfs type is available
-     the cast is required to avoid any G_GNUC_CONST optimizations */
-  casted_get_type = _g_local_vfs_get_type;
-  local_type = casted_get_type ();
-  
   /* Ensure vfs in modules loaded */
   _g_io_modules_ensure_loaded ();
 
-  vfs_impls = g_type_children (G_TYPE_VFS, &n_vfs_impls);
+  ep = g_io_extension_point_lookup (G_VFS_EXTENSION_POINT_NAME);
 
-  g_qsort_with_data (vfs_impls, n_vfs_impls, sizeof (GType),
-                    compare_vfs_type, (gpointer)use_this);
-  
-  for (i = 0; i < n_vfs_impls; i++)
+  if (use_this)
     {
-      vfs = g_object_new (vfs_impls[i], NULL);
+      extension = g_io_extension_point_get_extension_by_name (ep, use_this);
+      if (extension)
+       {
+         vfs = g_object_new (g_io_extension_get_type (extension), NULL);
+         
+         if (g_vfs_is_active (vfs))
+           return vfs;
+         
+         g_object_unref (vfs);
+       }
+    }
+
+  for (l = g_io_extension_point_get_extensions (ep); l != NULL; l = l->next)
+    {
+      extension = l->data;
+
+      vfs = g_object_new (g_io_extension_get_type (extension), NULL);
 
       if (g_vfs_is_active (vfs))
-       break;
+       return vfs;
 
       g_object_unref (vfs);
-      vfs = NULL;
     }
   
-  g_free (vfs_impls);
 
-  return vfs;
+  return NULL;
 }
 
 /**