Moved all relevant typedefs into these files.

2008-07-01  Cody Russell  <bratsche@gnome.org>

        * gio/gioenums.h:
        * gio/giotypes.h:
	Moved all relevant typedefs into these	files.

        * gio/*.[ch]:
	Updated wrt added files.

        Split types into separate file	for easier maintainership. (#538564)


svn path=/trunk/; revision=7127

1 files changed, 1 insertions, 50 deletions

diff --git a/gio/gfileinfo.h b/gio/gfileinfo.h
index 7743c1652..60ccfa892 100644
--- a/gio/gfileinfo.h
+++ b/gio/gfileinfo.h
@@ -27,9 +27,7 @@
 #ifndef __G_FILE_INFO_H__
 #define __G_FILE_INFO_H__
 
-#include <glib-object.h>
-#include <gio/gfileattribute.h>
-#include <gio/gicon.h>
+#include <gio/giotypes.h>
 
 G_BEGIN_DECLS
 
@@ -45,55 +43,8 @@ G_BEGIN_DECLS
  * 
  * Stores information about a file system object referenced by a #GFile.
  **/
-typedef struct _GFileInfo        GFileInfo;
 typedef struct _GFileInfoClass   GFileInfoClass;
 
-/**
- * GFileAttributeMatcher:
- * 
- * Determines if a string matches a file attribute.
- **/
-typedef struct _GFileAttributeMatcher GFileAttributeMatcher;
-
-/**
- * GFileType:
- * @G_FILE_TYPE_UNKNOWN: File's type is unknown.
- * @G_FILE_TYPE_REGULAR: File handle represents a regular file.
- * @G_FILE_TYPE_DIRECTORY: File handle represents a directory.
- * @G_FILE_TYPE_SYMBOLIC_LINK: File handle represents a symbolic link 
- *    (Unix systems).
- * @G_FILE_TYPE_SPECIAL: File is a "special" file, such as a socket, fifo, 
- *    block device, or character device.
- * @G_FILE_TYPE_SHORTCUT: File is a shortcut (Windows systems).
- * @G_FILE_TYPE_MOUNTABLE: File is a mountable location.
- * 
- * Indicates the file's on-disk type.
- **/
-typedef enum {
-  G_FILE_TYPE_UNKNOWN = 0,
-  G_FILE_TYPE_REGULAR,
-  G_FILE_TYPE_DIRECTORY,
-  G_FILE_TYPE_SYMBOLIC_LINK,
-  G_FILE_TYPE_SPECIAL, /* socket, fifo, blockdev, chardev */
-  G_FILE_TYPE_SHORTCUT,
-  G_FILE_TYPE_MOUNTABLE
-} GFileType;
-
-/**
- * GFilesystemPreviewType:
- * @G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS: Only preview files if user has explicitly requested it.
- * @G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL: Preview files if user has requested preview of "local" files.
- * @G_FILESYSTEM_PREVIEW_TYPE_NEVER: Never preview files.
- * 
- * Indicates a hint from the file system whether files should be
- * previewed in a file manager. Returned as the value of the key
- * #G_FILE_ATTRIBUTE_FILESYSTEM_USE_PREVIEW.
- **/
-typedef enum {
-  G_FILESYSTEM_PREVIEW_TYPE_IF_ALWAYS = 0,
-  G_FILESYSTEM_PREVIEW_TYPE_IF_LOCAL,
-  G_FILESYSTEM_PREVIEW_TYPE_NEVER
-} GFilesystemPreviewType;
 
 /* Common Attributes:  */
 /**