Update the year in the *.rc.in files

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

diff --git a/gio/glocalvfs.c b/gio/glocalvfs.c
index 7f64905..f2eaea2 100644 (file)
--- a/gio/glocalvfs.c
+++ b/gio/glocalvfs.c
@@ -20,16 +20,19 @@
  * Author: Alexander Larsson <alexl@redhat.com>
  */
 
-#include <config.h>
+#include "config.h"
 #include "glocalvfs.h"
 #include "glocalfile.h"
+#include "giomodule.h"
+#include "giomodule-priv.h"
+#include "gvfs.h"
 #include <gio/gdummyfile.h>
 #include <sys/types.h>
 #ifdef HAVE_PWD_H
 #include <pwd.h>
 #endif
+#include <string.h>
 
-#include "gioalias.h"
 
 struct _GLocalVfs
 {
@@ -43,8 +46,12 @@ struct _GLocalVfsClass
 };
 
 #define g_local_vfs_get_type _g_local_vfs_get_type
-G_DEFINE_TYPE (GLocalVfs, g_local_vfs, G_TYPE_VFS)
- 
+G_DEFINE_TYPE_WITH_CODE (GLocalVfs, g_local_vfs, G_TYPE_VFS,
+                        _g_io_modules_ensure_extension_points_registered ();
+                        g_io_extension_point_implement (G_VFS_EXTENSION_POINT_NAME,
+                                                        g_define_type_id,
+                                                        "local",
+                                                        0))
 static void
 g_local_vfs_finalize (GObject *object)
 {
@@ -83,9 +90,22 @@ g_local_vfs_get_file_for_uri (GVfs       *vfs,
 {
   char *path;
   GFile *file;
+  char *stripped_uri, *hash;
+  
+  if (strchr (uri, '#') != NULL)
+    {
+      stripped_uri = g_strdup (uri);
+      hash = strchr (stripped_uri, '#');
+      *hash = 0;
+    }
+  else
+    stripped_uri = (char *)uri;
+      
+  path = g_filename_from_uri (stripped_uri, NULL, NULL);
 
-  path = g_filename_from_uri (uri, NULL, NULL);
-
+  if (stripped_uri != uri)
+    g_free (stripped_uri);
+  
   if (path != NULL)
     file = _g_local_file_new (path);
   else
@@ -110,11 +130,9 @@ g_local_vfs_parse_name (GVfs       *vfs,
 {
   GFile *file;
   char *filename;
-  char *user_name;
   char *user_prefix;
   const char *user_start, *user_end;
   char *rest;
-  struct passwd *passwd_file_entry;
   
   g_return_val_if_fail (G_IS_VFS (vfs), NULL);
   g_return_val_if_fail (parse_name != NULL, NULL);
@@ -138,6 +156,9 @@ g_local_vfs_parse_name (GVfs       *vfs,
          else
            {
 #ifdef HAVE_PWD_H
+              struct passwd *passwd_file_entry;
+              char *user_name;
+
              user_name = g_strndup (user_start, user_end - user_start);
              passwd_file_entry = getpwnam (user_name);
              g_free (user_name);
@@ -189,9 +210,6 @@ g_local_vfs_class_init (GLocalVfsClass *class)
 
   vfs_class = G_VFS_CLASS (class);
 
-  vfs_class->name = "local";
-  vfs_class->priority = 0;
-  
   vfs_class->is_active = g_local_vfs_is_active;
   vfs_class->get_file_for_path = g_local_vfs_get_file_for_path;
   vfs_class->get_file_for_uri = g_local_vfs_get_file_for_uri;