Make attribute namespace separator "::" instead of ":". Use - instead of _

2007-12-12  Alexander Larsson  <alexl@redhat.com>

        * gfileattribute.c:
        * gfileinfo.[ch]:
        * glocalfile.c:
        * glocalfileinfo.c:
	Make attribute namespace separator "::" instead of ":".
	Use - instead of _ as separator in attribute names.

svn path=/trunk/; revision=6104

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 0150845..ddbace7 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,5 +1,14 @@
 2007-12-12  Alexander Larsson  <alexl@redhat.com>
 
+        * gfileattribute.c:
+        * gfileinfo.[ch]:
+        * glocalfile.c:
+        * glocalfileinfo.c:
+       Make attribute namespace separator "::" instead of ":".
+       Use - instead of _ as separator in attribute names.
+
+2007-12-12  Alexander Larsson  <alexl@redhat.com>
+
         * gbufferedinputstream.h:
         * gbufferedoutputstream.h:
         * gdatainputstream.h:

diff --git a/gio/gfileattribute.c b/gio/gfileattribute.c
index 45ccae3..2044cfd 100644 (file)
--- a/gio/gfileattribute.c
+++ b/gio/gfileattribute.c
@@ -121,65 +121,65 @@
  * <tgroup cols='3' align='left'><thead>
  * <row><entry>Enum Value</entry><entry>Namespace:Key</entry><entry>Value Type</entry></row>
  * </thead><tbody>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_TYPE</entry><entry>std:type</entry><entry>uint32 (#GFileType)</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_IS_HIDDEN</entry><entry>std:is_hidden</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_IS_BACKUP</entry><entry>std:is_backup</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_IS_SYMLINK</entry><entry>std:is_symlink</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_IS_VIRTUAL</entry><entry>std:is_virtual</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_NAME</entry><entry>std:name</entry><entry>byte string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_DISPLAY_NAME</entry><entry>std:display_name</entry><entry>string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_EDIT_NAME</entry><entry>std:edit_name</entry><entry>string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_ICON</entry><entry>std:icon</entry><entry>object (#GIcon)</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_CONTENT_TYPE</entry><entry>std:content_type</entry><entry>string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_FAST_CONTENT_TYPE</entry><entry>std:fast_content_type</entry><entry>string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_SIZE</entry><entry>std:size</entry><entry>uint64</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_SYMLINK_TARGET</entry><entry>std:symlink_target</entry><entry>byte string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_TARGET_URI</entry><entry>std:target_uri</entry><entry>string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_STD_SORT_ORDER</entry><entry>std:sort_order</entry><entry>int32</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_ETAG_VALUE</entry><entry>etag:value</entry><entry>string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_ID_FILE</entry><entry>id:file</entry><entry>string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_ID_FS</entry><entry>id:fs</entry><entry>string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_ACCESS_CAN_READ</entry><entry>access:can_read</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE</entry><entry>access:can_write</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE</entry><entry>access:can_execute</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE</entry><entry>access:can_delete</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH</entry><entry>access:can_trash</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME</entry><entry>access:can_rename</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT</entry><entry>mountable:can_mount</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT</entry><entry>mountable:can_unmount</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT</entry><entry>mountable:can_eject</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE</entry><entry>mountable:unix_device</entry><entry>uint32</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI</entry><entry>mountable:hal_udi</entry><entry>string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_TIME_MODIFIED</entry><entry>time:modified</entry><entry>uint64</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC</entry><entry>time:modified_usec</entry><entry>uint32</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_TIME_ACCESS</entry><entry>time:access</entry><entry>uint64</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_TIME_ACCESS_USEC</entry><entry>time:access_usec</entry><entry>uint32</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_TIME_CHANGED</entry><entry>time:changed</entry><entry>uint64</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_TIME_CHANGED_USEC</entry><entry>time:changed_usec</entry><entry>uint32</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_TIME_CREATED</entry><entry>time:created</entry><entry>uint64</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_TIME_CREATED_USEC</entry><entry>time:created_usec</entry><entry>uint32</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_UNIX_DEVICE</entry><entry>unix:device</entry><entry>uint32</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_UNIX_INODE</entry><entry>unix:inode</entry><entry>uint64</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_UNIX_MODE</entry><entry>unix:mode</entry><entry>uint32</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_UNIX_NLINK</entry><entry>unix:nlink</entry><entry>uint32</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_UNIX_UID</entry><entry>unix:uid</entry><entry>uint32</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_UNIX_GID</entry><entry>unix:gid</entry><entry>uint32</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_UNIX_RDEV</entry><entry>unix:rdev</entry><entry>uint32</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE</entry><entry>unix:block_size</entry><entry>uint32</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_UNIX_BLOCKS</entry><entry>unix:blocks</entry><entry>uint64</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT</entry><entry>unix:is_mountpoint</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE</entry><entry>dos:is_archive</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_DOS_IS_SYSTEM</entry><entry>dos:is_system</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_OWNER_USER</entry><entry>owner:user</entry><entry>string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_OWNER_USER_REAL</entry><entry>owner:user_real</entry><entry>string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_OWNER_GROUP</entry><entry>owner:group</entry><entry>string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_THUMBNAIL_PATH</entry><entry>thumbnail:path</entry><entry>bytestring</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_THUMBNAILING_FAILED</entry><entry>thumbnail:failed</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_FS_SIZE</entry><entry>fs:size</entry><entry>uint64</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_FS_FREE</entry><entry>fs:free</entry><entry>uint64</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_FS_TYPE</entry><entry>fs:type</entry><entry>string</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_FS_READONLY</entry><entry>fs:readonly</entry><entry>boolean</entry></row>
- * <row><entry>%G_FILE_ATTRIBUTE_GVFS_BACKEND</entry><entry>gvfs:backend</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_TYPE</entry><entry>std::type</entry><entry>uint32 (#GFileType)</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_IS_HIDDEN</entry><entry>std::is-hidden</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_IS_BACKUP</entry><entry>std::is-backup</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_IS_SYMLINK</entry><entry>std::is-symlink</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_IS_VIRTUAL</entry><entry>std::is-virtual</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_NAME</entry><entry>std::name</entry><entry>byte string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_DISPLAY_NAME</entry><entry>std::display-name</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_EDIT_NAME</entry><entry>std::edit-name</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_ICON</entry><entry>std::icon</entry><entry>object (#GIcon)</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_CONTENT_TYPE</entry><entry>std::content-type</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_FAST_CONTENT_TYPE</entry><entry>std::fast-content-type</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_SIZE</entry><entry>std::size</entry><entry>uint64</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_SYMLINK_TARGET</entry><entry>std::symlink-target</entry><entry>byte string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_TARGET_URI</entry><entry>std::target-uri</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_STD_SORT_ORDER</entry><entry>std::sort-order</entry><entry>int32</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_ETAG_VALUE</entry><entry>etag::value</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_ID_FILE</entry><entry>id::file</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_ID_FS</entry><entry>id::fs</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_ACCESS_CAN_READ</entry><entry>access::can-read</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE</entry><entry>access::can-write</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE</entry><entry>access::can-execute</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE</entry><entry>access::can-delete</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH</entry><entry>access::can-trash</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME</entry><entry>access::can-rename</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT</entry><entry>mountable::can-mount</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT</entry><entry>mountable::can-unmount</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT</entry><entry>mountable::can-eject</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE</entry><entry>mountable::unix-device</entry><entry>uint32</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI</entry><entry>mountable::hal-udi</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_TIME_MODIFIED</entry><entry>time::modified</entry><entry>uint64</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC</entry><entry>time::modified-usec</entry><entry>uint32</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_TIME_ACCESS</entry><entry>time::access</entry><entry>uint64</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_TIME_ACCESS_USEC</entry><entry>time::access-usec</entry><entry>uint32</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_TIME_CHANGED</entry><entry>time::changed</entry><entry>uint64</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_TIME_CHANGED_USEC</entry><entry>time::changed-usec</entry><entry>uint32</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_TIME_CREATED</entry><entry>time::created</entry><entry>uint64</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_TIME_CREATED_USEC</entry><entry>time::created-usec</entry><entry>uint32</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_UNIX_DEVICE</entry><entry>unix::device</entry><entry>uint32</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_UNIX_INODE</entry><entry>unix::inode</entry><entry>uint64</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_UNIX_MODE</entry><entry>unix::mode</entry><entry>uint32</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_UNIX_NLINK</entry><entry>unix::nlink</entry><entry>uint32</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_UNIX_UID</entry><entry>unix::uid</entry><entry>uint32</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_UNIX_GID</entry><entry>unix::gid</entry><entry>uint32</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_UNIX_RDEV</entry><entry>unix::rdev</entry><entry>uint32</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE</entry><entry>unix::block-size</entry><entry>uint32</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_UNIX_BLOCKS</entry><entry>unix::blocks</entry><entry>uint64</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT</entry><entry>unix::is-mountpoint</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE</entry><entry>dos::is-archive</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_DOS_IS_SYSTEM</entry><entry>dos::is-system</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_OWNER_USER</entry><entry>owner::user</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_OWNER_USER_REAL</entry><entry>owner::user-real</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_OWNER_GROUP</entry><entry>owner::group</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_THUMBNAIL_PATH</entry><entry>thumbnail::path</entry><entry>bytestring</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_THUMBNAILING_FAILED</entry><entry>thumbnail::failed</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_FS_SIZE</entry><entry>fs::size</entry><entry>uint64</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_FS_FREE</entry><entry>fs::free</entry><entry>uint64</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_FS_TYPE</entry><entry>fs::type</entry><entry>string</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_FS_READONLY</entry><entry>fs::readonly</entry><entry>boolean</entry></row>
+ * <row><entry>%G_FILE_ATTRIBUTE_GVFS_BACKEND</entry><entry>gvfs::backend</entry><entry>string</entry></row>
  * </tbody></tgroup></table></para>
  *  
  **/ 

diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c
index 4c574b5..385e0bd 100644 (file)
--- a/gio/gfileinfo.c
+++ b/gio/gfileinfo.c
@@ -177,7 +177,7 @@ lookup_attribute (const char *attribute)
       return attr_id;
     }
 
-  colon = strchr (attribute, ':');
+  colon = strstr (attribute, "::");
   if (colon)
     ns = g_strndup (attribute, colon - attribute);
   else
@@ -1756,10 +1756,10 @@ matcher_add (GFileAttributeMatcher *matcher,
  * automatically destroyed.
  * 
  * The @attribute string should be formatted with specific keys separated
- * from namespaces with a colon. Several "namespace:key" strings may be 
- * concatenated with a single comma (e.g. "std:type,std:is_hidden"). 
+ * from namespaces with a double colon. Several "namespace::key" strings may be 
+ * concatenated with a single comma (e.g. "std::type,std::is-hidden"). 
  * The wildcard "*" may be used to match all keys and namespaces, or 
- * "namespace:*" will match all keys in a given namespace. 
+ * "namespace::*" will match all keys in a given namespace. 
  * 
  * Examples of strings to use:
  * <table>
@@ -1768,8 +1768,8 @@ matcher_add (GFileAttributeMatcher *matcher,
  * <row><entry> Matcher String </entry><entry> Matches </entry></row></thead>
  * <tbody>
  * <row><entry>"*"</entry><entry>matches all attributes.</entry></row>
- * <row><entry>"std:is_hidden"</entry><entry>matches only the key is_hidden in the std namespace.</entry></row>
- * <row><entry>"std:type,unix:*"</entry><entry>matches the type key in the std namespace and all keys in the unix 
+ * <row><entry>"std::is-hidden"</entry><entry>matches only the key is-hidden in the std namespace.</entry></row>
+ * <row><entry>"std::type,unix::*"</entry><entry>matches the type key in the std namespace and all keys in the unix 
  * namespace.</entry></row>
  * </tbody></tgroup>
  * </table>
@@ -1800,11 +1800,11 @@ g_file_attribute_matcher_new (const char *attributes)
        {
          guint32 id, mask;
   
-         colon = strchr (split[i], ':');
+         colon = strstr (split[i], "::");
          if (colon != NULL &&
-             !(colon[1] == 0 ||
-               (colon[1] == '*' &&
-                colon[2] == 0)))
+             !(colon[2] == 0 ||
+               (colon[2] == '*' &&
+                colon[3] == 0)))
            {
              id = lookup_attribute (split[i]);
              mask = 0xffffffff;
@@ -1975,7 +1975,7 @@ g_file_attribute_matcher_matches (GFileAttributeMatcher *matcher,
  * 
  * Checks if the matcher will match all of the keys in a given namespace.
  * This will always return %TRUE if a wildcard character is in use (e.g. if 
- * matcher was created with "std:*" and @ns is "std", or if matcher was created
+ * matcher was created with "std::*" and @ns is "std", or if matcher was created
  * using "*" and namespace is anything.) 
  * 
  * TODO: this is awkwardly worded.

diff --git a/gio/gfileinfo.h b/gio/gfileinfo.h
index 7633fc3..1614d12 100644 (file)
--- a/gio/gfileinfo.h
+++ b/gio/gfileinfo.h
@@ -84,7 +84,7 @@ typedef enum {
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
  * The value for this key should contain a #GFileType.
  **/
-#define G_FILE_ATTRIBUTE_STD_TYPE "std:type"                     /* uint32 (GFileType) */
+#define G_FILE_ATTRIBUTE_STD_TYPE "std::type"                     /* uint32 (GFileType) */
 
 /**
  * G_FILE_ATTRIBUTE_STD_IS_HIDDEN:
@@ -92,7 +92,7 @@ typedef enum {
  * A key in the "std" namespace for checking if a file is hidden. 
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  **/
-#define G_FILE_ATTRIBUTE_STD_IS_HIDDEN "std:is_hidden"           /* boolean */
+#define G_FILE_ATTRIBUTE_STD_IS_HIDDEN "std::is-hidden"           /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_STD_IS_BACKUP:
@@ -100,7 +100,7 @@ typedef enum {
  * A key in the "std" namespace for checking if a file is a backup file.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  **/
-#define G_FILE_ATTRIBUTE_STD_IS_BACKUP "std:is_backup"           /* boolean */
+#define G_FILE_ATTRIBUTE_STD_IS_BACKUP "std::is-backup"           /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_STD_IS_SYMLINK:
@@ -110,7 +110,7 @@ typedef enum {
  * to get the type.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  **/
-#define G_FILE_ATTRIBUTE_STD_IS_SYMLINK "std:is_symlink"         /* boolean */
+#define G_FILE_ATTRIBUTE_STD_IS_SYMLINK "std::is-symlink"         /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_STD_IS_VIRTUAL:
@@ -118,7 +118,7 @@ typedef enum {
  * A key in the "std" namespace for checking if a file is virtual.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  **/
-#define G_FILE_ATTRIBUTE_STD_IS_VIRTUAL "std:is_virtual"         /* boolean */
+#define G_FILE_ATTRIBUTE_STD_IS_VIRTUAL "std::is-virtual"         /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_STD_NAME:
@@ -130,7 +130,7 @@ typedef enum {
  * name in a user interface.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_STD_NAME "std:name"                     /* byte string */
+#define G_FILE_ATTRIBUTE_STD_NAME "std::name"                     /* byte string */
 
 /**
  * G_FILE_ATTRIBUTE_STD_DISPLAY_NAME:
@@ -140,7 +140,7 @@ typedef enum {
  * the UI.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_STD_DISPLAY_NAME "std:display_name"     /* string */
+#define G_FILE_ATTRIBUTE_STD_DISPLAY_NAME "std::display-name"     /* string */
 
 /**
  * G_FILE_ATTRIBUTE_STD_EDIT_NAME:
@@ -153,7 +153,7 @@ typedef enum {
  * 
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_STD_EDIT_NAME "std:edit_name"           /* string */
+#define G_FILE_ATTRIBUTE_STD_EDIT_NAME "std::edit-name"           /* string */
 
 /**
  * G_FILE_ATTRIBUTE_STD_COPY_NAME:
@@ -167,7 +167,7 @@ typedef enum {
  * 
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_STD_COPY_NAME "std:copy_name"           /* string */
+#define G_FILE_ATTRIBUTE_STD_COPY_NAME "std::copy-name"           /* string */
 
 /**
  * G_FILE_ATTRIBUTE_STD_ICON:
@@ -176,7 +176,7 @@ typedef enum {
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_OBJECT.
  * The value for this key should contain a #GIcon.
  **/
-#define G_FILE_ATTRIBUTE_STD_ICON "std:icon"                     /* object (GIcon) */
+#define G_FILE_ATTRIBUTE_STD_ICON "std::icon"                     /* object (GIcon) */
 
 /**
  * G_FILE_ATTRIBUTE_STD_CONTENT_TYPE:
@@ -185,7 +185,7 @@ typedef enum {
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
  * The value for this key should contain a valid content type.
  **/
-#define G_FILE_ATTRIBUTE_STD_CONTENT_TYPE "std:content_type"     /* string */
+#define G_FILE_ATTRIBUTE_STD_CONTENT_TYPE "std::content-type"     /* string */
 
 /**
  * G_FILE_ATTRIBUTE_STD_FAST_CONTENT_TYPE:
@@ -197,7 +197,7 @@ typedef enum {
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
  * 
  **/
-#define G_FILE_ATTRIBUTE_STD_FAST_CONTENT_TYPE "std:fast_content_type" /* string */
+#define G_FILE_ATTRIBUTE_STD_FAST_CONTENT_TYPE "std::fast-content-type" /* string */
 
 /**
  * G_FILE_ATTRIBUTE_STD_SIZE:
@@ -205,7 +205,7 @@ typedef enum {
  * A key in the "std" namespace for getting the file's size (in bytes).
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
  **/
-#define G_FILE_ATTRIBUTE_STD_SIZE "std:size"                     /* uint64 */
+#define G_FILE_ATTRIBUTE_STD_SIZE "std::size"                     /* uint64 */
 
 /**
  * G_FILE_ATTRIBUTE_STD_SYMLINK_TARGET:
@@ -214,7 +214,7 @@ typedef enum {
  * is a symlink. Corresponding #GFileAttributeType is 
  * %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_STD_SYMLINK_TARGET "std:symlink_target" /* byte string */
+#define G_FILE_ATTRIBUTE_STD_SYMLINK_TARGET "std::symlink-target" /* byte string */
 
 /**
  * G_FILE_ATTRIBUTE_STD_TARGET_URI:
@@ -223,7 +223,7 @@ typedef enum {
  * the case of %G_FILE_TYPE_SHORTCUT or %G_FILE_TYPE_MOUNTABLE files.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_STD_TARGET_URI "std:target_uri"         /* string */
+#define G_FILE_ATTRIBUTE_STD_TARGET_URI "std::target-uri"         /* string */
 
 /**
  * G_FILE_ATTRIBUTE_STD_SORT_ORDER:
@@ -235,7 +235,7 @@ typedef enum {
  * should be sorted first, and files without sort order as if sort order
  * was zero.
  **/
-#define G_FILE_ATTRIBUTE_STD_SORT_ORDER "std:sort_order"         /* int32  */
+#define G_FILE_ATTRIBUTE_STD_SORT_ORDER "std::sort-order"         /* int32  */
 
 /* Entity tags, used to avoid missing updates on save */
 
@@ -246,7 +246,7 @@ typedef enum {
  * entity tag. Corresponding #GFileAttributeType is 
  * %G_FILE_ATTRIBUTE_TYPE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_ETAG_VALUE "etag:value"                 /* string */
+#define G_FILE_ATTRIBUTE_ETAG_VALUE "etag::value"                 /* string */
 
 /* File identifier, for e.g. avoiding loops when doing recursive 
  * directory scanning 
@@ -260,7 +260,7 @@ typedef enum {
  * An example use would be during listing files, to avoid recursive
  * directory scanning.
  **/
-#define G_FILE_ATTRIBUTE_ID_FILE "id:file"                     /* string */
+#define G_FILE_ATTRIBUTE_ID_FILE "id::file"                     /* string */
 
 /**
  * G_FILE_ATTRIBUTE_ID_FS:
@@ -270,7 +270,7 @@ typedef enum {
  * An example use would be during listing files, to avoid recursive
  * directory scanning.
  **/
-#define G_FILE_ATTRIBUTE_ID_FS "id:fs"                         /* string */
+#define G_FILE_ATTRIBUTE_ID_FS "id::fs"                         /* string */
 
 /* Calculated Access Rights for current user */
 
@@ -281,7 +281,7 @@ typedef enum {
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  * This attribute will be %TRUE if the user is able to read the file.
  **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_READ "access:can_read"       /* boolean */
+#define G_FILE_ATTRIBUTE_ACCESS_CAN_READ "access::can-read"       /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE:
@@ -290,7 +290,7 @@ typedef enum {
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  * This attribute will be %TRUE if the user is able to write to the file.
  **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE "access:can_write"     /* boolean */
+#define G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE "access::can-write"     /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE:
@@ -299,7 +299,7 @@ typedef enum {
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  * This attribute will be %TRUE if the user is able to execute the file.
  **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE "access:can_execute" /* boolean */
+#define G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE "access::can-execute" /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE:
@@ -308,7 +308,7 @@ typedef enum {
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  * This attribute will be %TRUE if the user is able to delete the file.
  **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE "access:can_delete"   /* boolean */
+#define G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE "access::can-delete"   /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH:
@@ -318,7 +318,7 @@ typedef enum {
  * This attribute will be %TRUE if the user is able to move the file to 
  * the trash.
  **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH "access:can_trash"     /* boolean */
+#define G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH "access::can-trash"     /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME:
@@ -327,7 +327,7 @@ typedef enum {
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  * This attribute will be %TRUE if the user is able to rename the file.
  **/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME "access:can_rename"   /* boolean */ 
+#define G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME "access::can-rename"   /* boolean */ 
 
 /* TODO: Should we have special version for directories? can_enumerate, etc */
 
@@ -339,7 +339,7 @@ typedef enum {
  * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) is mountable.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT "mountable:can_mount"     /* boolean */
+#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT "mountable::can-mount"     /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT:
@@ -347,7 +347,7 @@ typedef enum {
  * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE)  is unmountable.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT "mountable:can_unmount" /* boolean */
+#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT "mountable::can-unmount" /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT:
@@ -355,7 +355,7 @@ typedef enum {
  * A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be ejected.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT "mountable:can_eject"     /* boolean */
+#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT "mountable::can-eject"     /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE:
@@ -363,7 +363,7 @@ typedef enum {
  * A key in the "mountable" namespace for getting the unix device.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
  **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE "mountable:unix_device" /* uint32 */
+#define G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE "mountable::unix-device" /* uint32 */
 
 /**
  * G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI:
@@ -371,7 +371,7 @@ typedef enum {
  * A key in the "mountable" namespace for getting the HAL UDI for the mountable
  * file. Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI "mountable:hal_udi"         /* string */
+#define G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI "mountable::hal-udi"         /* string */
 
 /* Time attributes */
 
@@ -383,7 +383,7 @@ typedef enum {
  * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the 
  * file was modified.
  **/
-#define G_FILE_ATTRIBUTE_TIME_MODIFIED "time:modified"           /* uint64 */
+#define G_FILE_ATTRIBUTE_TIME_MODIFIED "time::modified"           /* uint64 */
 
 /**
  * G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC:
@@ -393,7 +393,7 @@ typedef enum {
  * #G_FILE_ATTRIBUTE_TIME_MODIFIED. Corresponding #GFileAttributeType is 
  * %G_FILE_ATTRIBUTE_TYPE_UINT32.
  **/
-#define G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC "time:modified_usec" /* uint32 */
+#define G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC "time::modified-usec" /* uint32 */
 
 /**
  * G_FILE_ATTRIBUTE_TIME_ACCESS:
@@ -403,7 +403,7 @@ typedef enum {
  * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the 
  * file was last accessed.
  **/
-#define G_FILE_ATTRIBUTE_TIME_ACCESS "time:access"               /* uint64 */
+#define G_FILE_ATTRIBUTE_TIME_ACCESS "time::access"               /* uint64 */
 
 /**
  * G_FILE_ATTRIBUTE_TIME_ACCESS_USEC:
@@ -413,7 +413,7 @@ typedef enum {
  * #G_FILE_ATTRIBUTE_TIME_ACCESS. Corresponding #GFileAttributeType is 
  * %G_FILE_ATTRIBUTE_TYPE_UINT32.
  **/
-#define G_FILE_ATTRIBUTE_TIME_ACCESS_USEC "time:access_usec"     /* uint32 */
+#define G_FILE_ATTRIBUTE_TIME_ACCESS_USEC "time::access-usec"     /* uint32 */
 
 /**
  * G_FILE_ATTRIBUTE_TIME_CHANGED:
@@ -424,7 +424,7 @@ typedef enum {
  *
  * This corresponds to the traditional UNIX ctime.
  **/
-#define G_FILE_ATTRIBUTE_TIME_CHANGED "time:changed"             /* uint64 */
+#define G_FILE_ATTRIBUTE_TIME_CHANGED "time::changed"             /* uint64 */
 
 /**
  * G_FILE_ATTRIBUTE_TIME_CHANGED_USEC:
@@ -434,7 +434,7 @@ typedef enum {
  * #G_FILE_ATTRIBUTE_TIME_CHANGED. Corresponding #GFileAttributeType is 
  * %G_FILE_ATTRIBUTE_TYPE_UINT32. 
  **/
-#define G_FILE_ATTRIBUTE_TIME_CHANGED_USEC "time:changed_usec"   /* uint32 */
+#define G_FILE_ATTRIBUTE_TIME_CHANGED_USEC "time::changed-usec"   /* uint32 */
 
 /**
  * G_FILE_ATTRIBUTE_TIME_CREATED:
@@ -445,7 +445,7 @@ typedef enum {
  *
  * This corresponds to the NTFS ctime.
  **/
-#define G_FILE_ATTRIBUTE_TIME_CREATED "time:created"             /* uint64 */
+#define G_FILE_ATTRIBUTE_TIME_CREATED "time::created"             /* uint64 */
 
 /**
  * G_FILE_ATTRIBUTE_TIME_CREATED_USEC:
@@ -455,7 +455,7 @@ typedef enum {
  * #G_FILE_ATTRIBUTE_TIME_CREATED. Corresponding #GFileAttributeType is 
  * %G_FILE_ATTRIBUTE_TYPE_UINT32. 
  **/
-#define G_FILE_ATTRIBUTE_TIME_CREATED_USEC "time:created_usec"   /* uint32 */
+#define G_FILE_ATTRIBUTE_TIME_CREATED_USEC "time::created-usec"   /* uint32 */
 
 /* Unix specific attributes */
 
@@ -467,7 +467,7 @@ typedef enum {
  * available for UNIX file systems. Corresponding #GFileAttributeType is 
  * %G_FILE_ATTRIBUTE_TYPE_UINT32. 
  **/
-#define G_FILE_ATTRIBUTE_UNIX_DEVICE "unix:device"               /* uint32 */
+#define G_FILE_ATTRIBUTE_UNIX_DEVICE "unix::device"               /* uint32 */
 
 /**
  * G_FILE_ATTRIBUTE_UNIX_INODE:
@@ -476,7 +476,7 @@ typedef enum {
  * This attribute is only available for UNIX file systems. Corresponding 
  * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
  **/
-#define G_FILE_ATTRIBUTE_UNIX_INODE "unix:inode"                 /* uint64 */
+#define G_FILE_ATTRIBUTE_UNIX_INODE "unix::inode"                 /* uint64 */
 
 /**
  * G_FILE_ATTRIBUTE_UNIX_MODE:
@@ -486,7 +486,7 @@ typedef enum {
  * documentation. This attribute is only available for UNIX file systems. 
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
  **/
-#define G_FILE_ATTRIBUTE_UNIX_MODE "unix:mode"                   /* uint32 */
+#define G_FILE_ATTRIBUTE_UNIX_MODE "unix::mode"                   /* uint32 */
 
 /**
  * G_FILE_ATTRIBUTE_UNIX_NLINK:
@@ -496,7 +496,7 @@ typedef enum {
  * for UNIX file systems. Corresponding #GFileAttributeType is 
  * %G_FILE_ATTRIBUTE_TYPE_UINT32.
  **/
-#define G_FILE_ATTRIBUTE_UNIX_NLINK "unix:nlink"                 /* uint32 */
+#define G_FILE_ATTRIBUTE_UNIX_NLINK "unix::nlink"                 /* uint32 */
 
 /**
  * G_FILE_ATTRIBUTE_UNIX_UID:
@@ -505,7 +505,7 @@ typedef enum {
  * This attribute is only available for UNIX file systems. 
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
  **/
-#define G_FILE_ATTRIBUTE_UNIX_UID "unix:uid"                     /* uint32 */
+#define G_FILE_ATTRIBUTE_UNIX_UID "unix::uid"                     /* uint32 */
 
 /**
  * G_FILE_ATTRIBUTE_UNIX_GID:
@@ -514,7 +514,7 @@ typedef enum {
  * This attribute is only available for UNIX file systems. 
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
  **/
-#define G_FILE_ATTRIBUTE_UNIX_GID "unix:gid"                     /* uint32 */
+#define G_FILE_ATTRIBUTE_UNIX_GID "unix::gid"                     /* uint32 */
 
 /**
  * G_FILE_ATTRIBUTE_UNIX_RDEV:
@@ -524,7 +524,7 @@ typedef enum {
  * is only available for UNIX file systems. Corresponding #GFileAttributeType 
  * is %G_FILE_ATTRIBUTE_TYPE_UINT32.
  **/
-#define G_FILE_ATTRIBUTE_UNIX_RDEV "unix:rdev"                   /* uint32 */
+#define G_FILE_ATTRIBUTE_UNIX_RDEV "unix::rdev"                   /* uint32 */
 
 /**
  * G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE:
@@ -533,7 +533,7 @@ typedef enum {
  * system. This attribute is only available for UNIX file systems. 
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
  **/
-#define G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE "unix:block_size"       /* uint32 */
+#define G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE "unix::block-size"       /* uint32 */
 
 /**
  * G_FILE_ATTRIBUTE_UNIX_BLOCKS:
@@ -542,7 +542,7 @@ typedef enum {
  * for the file. This attribute is only available for UNIX file systems. 
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
  **/
-#define G_FILE_ATTRIBUTE_UNIX_BLOCKS "unix:blocks"               /* uint64 */
+#define G_FILE_ATTRIBUTE_UNIX_BLOCKS "unix::blocks"               /* uint64 */
 
 /**
  * G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT:
@@ -552,7 +552,7 @@ typedef enum {
  * point. This attribute is only available for UNIX file systems. 
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  **/
-#define G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT "unix:is_mountpoint" /* boolean */
+#define G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT "unix::is-mountpoint" /* boolean */
 
 /* DOS specific attributes */
 
@@ -564,7 +564,7 @@ typedef enum {
  * is only available for DOS file systems. Corresponding #GFileAttributeType 
  * is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  **/
-#define G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE "dos:is_archive"         /* boolean */
+#define G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE "dos::is-archive"         /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_DOS_IS_SYSTEM:
@@ -574,7 +574,7 @@ typedef enum {
  * is only available for DOS file systems. Corresponding #GFileAttributeType 
  * is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  **/
-#define G_FILE_ATTRIBUTE_DOS_IS_SYSTEM "dos:is_system"           /* boolean */
+#define G_FILE_ATTRIBUTE_DOS_IS_SYSTEM "dos::is-system"           /* boolean */
 
 /* Owner attributes */
 
@@ -585,7 +585,7 @@ typedef enum {
  * file's owner. Corresponding #GFileAttributeType is 
  * %G_FILE_ATTRIBUTE_TYPE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_OWNER_USER "owner:user"                 /* string */
+#define G_FILE_ATTRIBUTE_OWNER_USER "owner::user"                 /* string */
 
 /**
  * G_FILE_ATTRIBUTE_OWNER_USER_REAL:
@@ -594,7 +594,7 @@ typedef enum {
  * user that owns the file. Corresponding #GFileAttributeType is 
  * %G_FILE_ATTRIBUTE_TYPE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_OWNER_USER_REAL "owner:user_real"       /* string */
+#define G_FILE_ATTRIBUTE_OWNER_USER_REAL "owner::user-real"       /* string */
 
 /**
  * G_FILE_ATTRIBUTE_OWNER_GROUP:
@@ -602,7 +602,7 @@ typedef enum {
  * A key in the "owner" namespace for getting the file owner's group.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_OWNER_GROUP "owner:group"               /* string */
+#define G_FILE_ATTRIBUTE_OWNER_GROUP "owner::group"               /* string */
 
 /* Thumbnails */
 
@@ -613,7 +613,7 @@ typedef enum {
  * image. Corresponding #GFileAttributeType is 
  * %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_THUMBNAIL_PATH "thumbnail:path"         /* bytestring */
+#define G_FILE_ATTRIBUTE_THUMBNAIL_PATH "thumbnail::path"         /* bytestring */
 /**
  * G_FILE_ATTRIBUTE_THUMBNAILING_FAILED:
  * 
@@ -621,7 +621,7 @@ typedef enum {
  * This attribute is %TRUE if thumbnailing failed. Corresponding 
  * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN. 
  **/
-#define G_FILE_ATTRIBUTE_THUMBNAILING_FAILED "thumbnail:failed"         /* boolean */
+#define G_FILE_ATTRIBUTE_THUMBNAILING_FAILED "thumbnail::failed"         /* boolean */
 
 /* File system info (for g_file_get_filesystem_info) */
 
@@ -632,7 +632,7 @@ typedef enum {
  * used in g_file_query_filesystem_info(). Corresponding #GFileAttributeType 
  * is %G_FILE_ATTRIBUTE_TYPE_UINT64.
  **/
-#define G_FILE_ATTRIBUTE_FS_SIZE "fs:size"                       /* uint64 */
+#define G_FILE_ATTRIBUTE_FS_SIZE "fs::size"                       /* uint64 */
 
 /**
  * G_FILE_ATTRIBUTE_FS_FREE:
@@ -641,7 +641,7 @@ typedef enum {
  * file system. Corresponding #GFileAttributeType is 
  * %G_FILE_ATTRIBUTE_TYPE_UINT64.
  **/
-#define G_FILE_ATTRIBUTE_FS_FREE "fs:free"                       /* uint64 */
+#define G_FILE_ATTRIBUTE_FS_FREE "fs::free"                       /* uint64 */
 
 /**
  * G_FILE_ATTRIBUTE_FS_TYPE:
@@ -649,7 +649,7 @@ typedef enum {
  * A key in the "fs" namespace for getting the file system's type.
  * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_FS_TYPE "fs:type"                       /* string */
+#define G_FILE_ATTRIBUTE_FS_TYPE "fs::type"                       /* string */
 
 /**
  * G_FILE_ATTRIBUTE_FS_READONLY:
@@ -658,7 +658,7 @@ typedef enum {
  * Is set to %TRUE if the file system is read only. Corresponding 
  * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
  **/
-#define G_FILE_ATTRIBUTE_FS_READONLY "fs:readonly"               /* boolean */
+#define G_FILE_ATTRIBUTE_FS_READONLY "fs::readonly"               /* boolean */
 
 /**
  * G_FILE_ATTRIBUTE_GVFS_BACKEND:
@@ -667,7 +667,7 @@ typedef enum {
  * GVFS backend in use. Corresponding #GFileAttributeType is 
  * %G_FILE_ATTRIBUTE_TYPE_STRING.
  **/
-#define G_FILE_ATTRIBUTE_GVFS_BACKEND "gvfs:backend"             /* string */
+#define G_FILE_ATTRIBUTE_GVFS_BACKEND "gvfs::backend"             /* string */
 
 GType g_file_info_get_type (void) G_GNUC_CONST;
 

diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 1afa66e..1cfaf08 100644 (file)
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -195,7 +195,7 @@ g_local_file_class_init (GLocalFileClass *klass)
                                  G_FILE_ATTRIBUTE_FLAGS_COPY_WITH_FILE |
                                  G_FILE_ATTRIBUTE_FLAGS_COPY_WHEN_MOVED);
   g_file_attribute_info_list_add (list,
-                                 "xattr_sys",
+                                 "xattr-sys",
                                  G_FILE_ATTRIBUTE_TYPE_STRING,
                                  G_FILE_ATTRIBUTE_FLAGS_COPY_WHEN_MOVED);
 #endif

diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index 0a5e04c..c9d1a09 100644 (file)
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -184,7 +184,7 @@ get_selinux_context (const char            *path,
 #ifdef HAVE_SELINUX
   char *context;
 
-  if (!g_file_attribute_matcher_matches (attribute_matcher, "selinux:context"))
+  if (!g_file_attribute_matcher_matches (attribute_matcher, "selinux::context"))
     return;
   
   if (is_selinux_enabled ())
@@ -202,7 +202,7 @@ get_selinux_context (const char            *path,
 
       if (context)
        {
-         g_file_info_set_attribute_string (info, "selinux:context", context);
+         g_file_info_set_attribute_string (info, "selinux::context", context);
          freecon(context);
        }
     }
@@ -483,12 +483,12 @@ get_xattrs (const char            *path,
              if (user)
                {
                  escaped_attr = hex_escape_string (attr + 5, &free_escaped_attr);
-                 gio_attr = g_strconcat ("xattr:", escaped_attr, NULL);
+                 gio_attr = g_strconcat ("xattr::", escaped_attr, NULL);
                }
              else
                {
                  escaped_attr = hex_escape_string (attr, &free_escaped_attr);
-                 gio_attr = g_strconcat ("xattr_sys:", escaped_attr, NULL);
+                 gio_attr = g_strconcat ("xattr-sys::", escaped_attr, NULL);
                }
              
              if (free_escaped_attr)
@@ -597,7 +597,7 @@ get_xattrs_from_fd (int                    fd,
   if (user)
     all = g_file_attribute_matcher_enumerate_namespace (matcher, "xattr");
   else
-    all = g_file_attribute_matcher_enumerate_namespace (matcher, "xattr_sys");
+    all = g_file_attribute_matcher_enumerate_namespace (matcher, "xattr-sys");
 
   if (all)
     {
@@ -636,12 +636,12 @@ get_xattrs_from_fd (int                    fd,
              if (user)
                {
                  escaped_attr = hex_escape_string (attr + 5, &free_escaped_attr);
-                 gio_attr = g_strconcat ("xattr:", escaped_attr, NULL);
+                 gio_attr = g_strconcat ("xattr::", escaped_attr, NULL);
                }
              else
                {
                  escaped_attr = hex_escape_string (attr, &free_escaped_attr);
-                 gio_attr = g_strconcat ("xattr_sys:", escaped_attr, NULL);
+                 gio_attr = g_strconcat ("xattr-sys::", escaped_attr, NULL);
                }
              
              if (free_escaped_attr)
@@ -721,14 +721,14 @@ set_xattr (char                       *filename,
       return FALSE;
     }
 
-  if (g_str_has_prefix (escaped_attribute, "xattr:"))
+  if (g_str_has_prefix (escaped_attribute, "xattr::"))
     {
       escaped_attribute += 6;
       is_user = TRUE;
     }
   else
     {
-      g_warn_if_fail (g_str_has_prefix (escaped_attribute, "xattr_sys:"));
+      g_warn_if_fail (g_str_has_prefix (escaped_attribute, "xattr-sys::"));
       escaped_attribute += 10;
       is_user = FALSE;
     }
@@ -1971,9 +1971,9 @@ _g_local_file_info_set_attribute (char                       *filename,
 #endif
 
 #ifdef HAVE_XATTR
-  else if (g_str_has_prefix (attribute, "xattr:"))
+  else if (g_str_has_prefix (attribute, "xattr::"))
     return set_xattr (filename, attribute, value, error);
-  else if (g_str_has_prefix (attribute, "xattr_sys:"))
+  else if (g_str_has_prefix (attribute, "xattr-sys::"))
     return set_xattr (filename, attribute, value, error);
 #endif