[glib/glib-2-58] Revert "W32: new GFileInfo attributes"

[Philip Withnall <pwithnall src gnome org>]

commit 190c92566774cbf55134e2a23867f87e63a6e0b8
Author: Philip Withnall <withnall endlessm com>
Date:   Tue Dec 18 14:24:31 2018 +0000

    Revert "W32: new GFileInfo attributes"
    
    This reverts commit a2375b8929c70eb9cdb98e828643955c823be52d.
    
    It adds new API, and hence should not have been merged to the stable
    branch. This commit will remain in place on master (which will become
    GLib 2.60).

 gio/gfileinfo-priv.h |  2 --
 gio/gfileinfo.c      |  2 --
 gio/gfileinfo.h      | 27 ---------------------------
 gio/glocalfileinfo.c |  6 ------
 4 files changed, 37 deletions(-)
---
diff --git a/gio/gfileinfo-priv.h b/gio/gfileinfo-priv.h
index e2bdaa33d..201b8c946 100644
--- a/gio/gfileinfo-priv.h
+++ b/gio/gfileinfo-priv.h
@@ -85,8 +85,6 @@
 #define G_FILE_ATTRIBUTE_ID_UNIX_IS_MOUNTPOINT (7340032 + 10)
 #define G_FILE_ATTRIBUTE_ID_DOS_IS_ARCHIVE (8388608 + 1)
 #define G_FILE_ATTRIBUTE_ID_DOS_IS_SYSTEM (8388608 + 2)
-#define G_FILE_ATTRIBUTE_ID_DOS_IS_MOUNTPOINT (8388608 + 3)
-#define G_FILE_ATTRIBUTE_ID_DOS_REPARSE_POINT_TAG (8388608 + 4)
 #define G_FILE_ATTRIBUTE_ID_OWNER_USER (9437184 + 1)
 #define G_FILE_ATTRIBUTE_ID_OWNER_USER_REAL (9437184 + 2)
 #define G_FILE_ATTRIBUTE_ID_OWNER_GROUP (9437184 + 3)
diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c
index fa53a9c49..a595c6f4a 100644
--- a/gio/gfileinfo.c
+++ b/gio/gfileinfo.c
@@ -245,8 +245,6 @@ ensure_attribute_hash (void)
   REGISTER_ATTRIBUTE (UNIX_IS_MOUNTPOINT);
   REGISTER_ATTRIBUTE (DOS_IS_ARCHIVE);
   REGISTER_ATTRIBUTE (DOS_IS_SYSTEM);
-  REGISTER_ATTRIBUTE (DOS_IS_MOUNTPOINT);
-  REGISTER_ATTRIBUTE (DOS_REPARSE_POINT_TAG);
   REGISTER_ATTRIBUTE (OWNER_USER);
   REGISTER_ATTRIBUTE (OWNER_USER_REAL);
   REGISTER_ATTRIBUTE (OWNER_GROUP);
diff --git a/gio/gfileinfo.h b/gio/gfileinfo.h
index 2ca623c3a..8416b4fad 100644
--- a/gio/gfileinfo.h
+++ b/gio/gfileinfo.h
@@ -672,33 +672,6 @@ typedef struct _GFileInfoClass   GFileInfoClass;
  **/
 #define G_FILE_ATTRIBUTE_DOS_IS_SYSTEM "dos::is-system"           /* boolean */
 
-/**
- * G_FILE_ATTRIBUTE_DOS_IS_MOUNTPOINT:
- *
- * A key in the "dos" namespace for checking if the file is a NTFS mount point
- * (a volume mount or a junction point).
- * This attribute is %TRUE if file is a reparse point of type
- * [IO_REPARSE_TAG_MOUNT_POINT](https://msdn.microsoft.com/en-us/library/dd541667.aspx).
- * This attribute is only available for DOS file systems.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- *
- * Since: 2.60
- **/
-#define G_FILE_ATTRIBUTE_DOS_IS_MOUNTPOINT "dos::is-mountpoint"   /* boolean */
-
-/**
- * G_FILE_ATTRIBUTE_DOS_REPARSE_POINT_TAG:
- *
- * A key in the "dos" namespace for getting the file NTFS reparse tag.
- * This value is 0 for files that are not reparse points.
- * See the [Reparse Tags](https://msdn.microsoft.com/en-us/library/dd541667.aspx)
- * page for possible reparse tag values. Corresponding #GFileAttributeType
- * is %G_FILE_ATTRIBUTE_TYPE_UINT32.
- *
- * Since: 2.60
- **/
-#define G_FILE_ATTRIBUTE_DOS_REPARSE_POINT_TAG "dos::reparse-point-tag"   /* uint32 */
-
 /* Owner attributes */
 
 /**
diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index 4d2be7208..d86a0ce8b 100644
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -1867,12 +1867,6 @@ _g_local_file_info_get (const char             *basename,
 
   if (statbuf.attributes & FILE_ATTRIBUTE_SYSTEM)
     _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_DOS_IS_SYSTEM, TRUE);
-
-  if (statbuf.reparse_tag == IO_REPARSE_TAG_MOUNT_POINT)
-    _g_file_info_set_attribute_boolean_by_id (info, G_FILE_ATTRIBUTE_ID_DOS_IS_MOUNTPOINT, TRUE);
-
-  if (statbuf.reparse_tag != 0)
-    _g_file_info_set_attribute_uint32_by_id (info, G_FILE_ATTRIBUTE_ID_DOS_REPARSE_POINT_TAG, 
statbuf.reparse_tag);
 #endif
 
   symlink_target = NULL;