glib r7127 - in trunk: . gio gio/inotify gio/tests
- From: bratsche svn gnome org
- To: svn-commits-list gnome org
- Subject: glib r7127 - in trunk: . gio gio/inotify gio/tests
- Date: Tue, 1 Jul 2008 06:32:36 +0000 (UTC)
Author: bratsche
Date: Tue Jul 1 06:32:35 2008
New Revision: 7127
URL: http://svn.gnome.org/viewvc/glib?rev=7127&view=rev
Log:
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)
Added:
trunk/gio/gioenums.h
trunk/gio/giotypes.h
Modified:
trunk/ChangeLog
trunk/gio/Makefile.am
trunk/gio/gappinfo.h
trunk/gio/gasynchelper.h
trunk/gio/gasyncresult.h
trunk/gio/gbufferedinputstream.c
trunk/gio/gbufferedinputstream.h
trunk/gio/gbufferedoutputstream.h
trunk/gio/gcancellable.h
trunk/gio/gcontenttype.h
trunk/gio/gdatainputstream.c
trunk/gio/gdatainputstream.h
trunk/gio/gdataoutputstream.h
trunk/gio/gdesktopappinfo.c
trunk/gio/gdrive.c
trunk/gio/gdrive.h
trunk/gio/gdummyfile.c
trunk/gio/gdummyfile.h
trunk/gio/gfile.c
trunk/gio/gfile.h
trunk/gio/gfileattribute.h
trunk/gio/gfileenumerator.c
trunk/gio/gfileenumerator.h
trunk/gio/gfileicon.c
trunk/gio/gfileicon.h
trunk/gio/gfileinfo.c
trunk/gio/gfileinfo.h
trunk/gio/gfileinputstream.c
trunk/gio/gfileinputstream.h
trunk/gio/gfilemonitor.c
trunk/gio/gfilemonitor.h
trunk/gio/gfilenamecompleter.c
trunk/gio/gfilenamecompleter.h
trunk/gio/gfileoutputstream.c
trunk/gio/gfileoutputstream.h
trunk/gio/gfilterinputstream.h
trunk/gio/gfilteroutputstream.h
trunk/gio/gicon.h
trunk/gio/ginputstream.c
trunk/gio/ginputstream.h
trunk/gio/gio.h
trunk/gio/gioerror.h
trunk/gio/giomodule.h
trunk/gio/gioscheduler.c
trunk/gio/gioscheduler.h
trunk/gio/gloadableicon.c
trunk/gio/gloadableicon.h
trunk/gio/glocaldirectorymonitor.c
trunk/gio/glocaldirectorymonitor.h
trunk/gio/glocalfile.c
trunk/gio/glocalfile.h
trunk/gio/glocalfileenumerator.c
trunk/gio/glocalfileenumerator.h
trunk/gio/glocalfileinputstream.c
trunk/gio/glocalfilemonitor.c
trunk/gio/glocalfilemonitor.h
trunk/gio/glocalfileoutputstream.c
trunk/gio/glocalfileoutputstream.h
trunk/gio/glocalvfs.c
trunk/gio/glocalvfs.h
trunk/gio/gmemoryinputstream.c
trunk/gio/gmemoryinputstream.h
trunk/gio/gmemoryoutputstream.c
trunk/gio/gmemoryoutputstream.h
trunk/gio/gmount.c
trunk/gio/gmount.h
trunk/gio/gmountoperation.h
trunk/gio/gnativevolumemonitor.h
trunk/gio/goutputstream.c
trunk/gio/goutputstream.h
trunk/gio/gpollfilemonitor.c
trunk/gio/gpollfilemonitor.h
trunk/gio/gseekable.h
trunk/gio/gsimpleasyncresult.c
trunk/gio/gsimpleasyncresult.h
trunk/gio/gthemedicon.c
trunk/gio/gthemedicon.h
trunk/gio/gunionvolumemonitor.h
trunk/gio/gunixmount.c
trunk/gio/gunixmount.h
trunk/gio/gunixmounts.h
trunk/gio/gunixvolume.c
trunk/gio/gunixvolume.h
trunk/gio/gunixvolumemonitor.c
trunk/gio/gunixvolumemonitor.h
trunk/gio/gvfs.h
trunk/gio/gvolume.c
trunk/gio/gvolume.h
trunk/gio/gvolumemonitor.c
trunk/gio/gvolumemonitor.h
trunk/gio/gwin32appinfo.h
trunk/gio/gwin32mount.h
trunk/gio/gwin32volumemonitor.h
trunk/gio/inotify/inotify-helper.c
trunk/gio/tests/live-g-file.c
Modified: trunk/gio/Makefile.am
==============================================================================
--- trunk/gio/Makefile.am (original)
+++ trunk/gio/Makefile.am Tue Jul 1 06:32:35 2008
@@ -188,6 +188,7 @@
gfilteroutputstream.c \
gicon.c \
ginputstream.c \
+ gioenums.h \
gioerror.c \
giomodule.c \
giomodule-priv.h \
@@ -288,6 +289,8 @@
gicon.h \
ginputstream.h \
gio.h \
+ giotypes.h \
+ gioenums.h \
gioerror.h \
giomodule.h \
gioscheduler.h \
Modified: trunk/gio/gappinfo.h
==============================================================================
--- trunk/gio/gappinfo.h (original)
+++ trunk/gio/gappinfo.h Tue Jul 1 06:32:35 2008
@@ -27,8 +27,7 @@
#ifndef __G_APP_INFO_H__
#define __G_APP_INFO_H__
-#include <glib-object.h>
-#include <gio/gicon.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -44,21 +43,6 @@
#define G_IS_APP_LAUNCH_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_APP_LAUNCH_CONTEXT))
#define G_APP_LAUNCH_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContextClass))
-/**
- * GAppInfoCreateFlags:
- * @G_APP_INFO_CREATE_NONE: No flags.
- * @G_APP_INFO_CREATE_NEEDS_TERMINAL: Application opens in a terminal window.
- * @G_APP_INFO_CREATE_SUPPORTS_URIS: Application supports URI arguments.
- *
- * Flags used when creating a #GAppInfo.
- */
-typedef enum {
- G_APP_INFO_CREATE_NONE = 0, /*< nick=none >*/
- G_APP_INFO_CREATE_NEEDS_TERMINAL = (1<<0), /*< nick=needs-terminal >*/
- G_APP_INFO_CREATE_SUPPORTS_URIS = (1<<1) /*< nick=supports-uris >*/
-} GAppInfoCreateFlags;
-
-typedef struct _GAppLaunchContext GAppLaunchContext;
typedef struct _GAppLaunchContextClass GAppLaunchContextClass;
typedef struct _GAppLaunchContextPrivate GAppLaunchContextPrivate;
@@ -68,7 +52,6 @@
* Information about an installed application and methods to launch
* it (with file arguments).
*/
-typedef struct _GAppInfo GAppInfo; /* Dummy typedef */
/**
* GAppInfoIface:
Modified: trunk/gio/gasynchelper.h
==============================================================================
--- trunk/gio/gasynchelper.h (original)
+++ trunk/gio/gasynchelper.h Tue Jul 1 06:32:35 2008
@@ -23,8 +23,7 @@
#ifndef __G_ASYNC_HELPER_H__
#define __G_ASYNC_HELPER_H__
-#include <glib-object.h>
-#include "gcancellable.h"
+#include <gio/gio.h>
G_BEGIN_DECLS
Modified: trunk/gio/gasyncresult.h
==============================================================================
--- trunk/gio/gasyncresult.h (original)
+++ trunk/gio/gasyncresult.h Tue Jul 1 06:32:35 2008
@@ -27,7 +27,7 @@
#ifndef __G_ASYNC_RESULT_H__
#define __G_ASYNC_RESULT_H__
-#include <glib-object.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -42,21 +42,8 @@
* Holds results information for an asynchronous operation,
* usually passed directly to a asynchronous _finish() operation.
**/
-typedef struct _GAsyncResult GAsyncResult; /* Dummy typedef */
typedef struct _GAsyncResultIface GAsyncResultIface;
-/**
- * GAsyncReadyCallback:
- * @source_object: the object the asynchronous operation was started with.
- * @res: a #GAsyncResult.
- * @user_data: user data passed to the callback.
- *
- * Type definition for a function that will be called back when an asynchronous
- * operation within GIO has been completed.
- **/
-typedef void (*GAsyncReadyCallback) (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data);
/**
* GAsyncResultIface:
Modified: trunk/gio/gbufferedinputstream.c
==============================================================================
--- trunk/gio/gbufferedinputstream.c (original)
+++ trunk/gio/gbufferedinputstream.c Tue Jul 1 06:32:35 2008
@@ -24,7 +24,10 @@
#include "config.h"
#include "gbufferedinputstream.h"
#include "ginputstream.h"
+#include "gcancellable.h"
+#include "gasyncresult.h"
#include "gsimpleasyncresult.h"
+#include "gioerror.h"
#include <string.h>
#include "glibintl.h"
Modified: trunk/gio/gbufferedinputstream.h
==============================================================================
--- trunk/gio/gbufferedinputstream.h (original)
+++ trunk/gio/gbufferedinputstream.h Tue Jul 1 06:32:35 2008
@@ -27,7 +27,6 @@
#ifndef __G_BUFFERED_INPUT_STREAM_H__
#define __G_BUFFERED_INPUT_STREAM_H__
-#include <glib-object.h>
#include <gio/gfilterinputstream.h>
G_BEGIN_DECLS
@@ -44,7 +43,6 @@
*
* Implements #GFilterInputStream with a sized input buffer.
**/
-typedef struct _GBufferedInputStream GBufferedInputStream;
typedef struct _GBufferedInputStreamClass GBufferedInputStreamClass;
typedef struct _GBufferedInputStreamPrivate GBufferedInputStreamPrivate;
Modified: trunk/gio/gbufferedoutputstream.h
==============================================================================
--- trunk/gio/gbufferedoutputstream.h (original)
+++ trunk/gio/gbufferedoutputstream.h Tue Jul 1 06:32:35 2008
@@ -27,7 +27,6 @@
#ifndef __G_BUFFERED_OUTPUT_STREAM_H__
#define __G_BUFFERED_OUTPUT_STREAM_H__
-#include <glib-object.h>
#include <gio/gfilteroutputstream.h>
G_BEGIN_DECLS
@@ -45,7 +44,6 @@
*
* An implementation of #GFilterOutputStream with a sized buffer.
**/
-typedef struct _GBufferedOutputStream GBufferedOutputStream;
typedef struct _GBufferedOutputStreamClass GBufferedOutputStreamClass;
typedef struct _GBufferedOutputStreamPrivate GBufferedOutputStreamPrivate;
Modified: trunk/gio/gcancellable.h
==============================================================================
--- trunk/gio/gcancellable.h (original)
+++ trunk/gio/gcancellable.h Tue Jul 1 06:32:35 2008
@@ -27,7 +27,7 @@
#ifndef __G_CANCELLABLE_H__
#define __G_CANCELLABLE_H__
-#include <glib-object.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -43,7 +43,6 @@
*
* Allows actions to be cancelled.
*/
-typedef struct _GCancellable GCancellable;
typedef struct _GCancellableClass GCancellableClass;
struct _GCancellableClass
Modified: trunk/gio/gcontenttype.h
==============================================================================
--- trunk/gio/gcontenttype.h (original)
+++ trunk/gio/gcontenttype.h Tue Jul 1 06:32:35 2008
@@ -28,7 +28,7 @@
#define __G_CONTENT_TYPE_H__
#include <glib.h>
-#include <gio/gicon.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
Modified: trunk/gio/gdatainputstream.c
==============================================================================
--- trunk/gio/gdatainputstream.c (original)
+++ trunk/gio/gdatainputstream.c Tue Jul 1 06:32:35 2008
@@ -24,6 +24,7 @@
#include "config.h"
#include "gdatainputstream.h"
#include "gioenumtypes.h"
+#include "gioerror.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gdatainputstream.h
==============================================================================
--- trunk/gio/gdatainputstream.h (original)
+++ trunk/gio/gdatainputstream.h Tue Jul 1 06:32:35 2008
@@ -27,7 +27,6 @@
#ifndef __G_DATA_INPUT_STREAM_H__
#define __G_DATA_INPUT_STREAM_H__
-#include <glib-object.h>
#include <gio/gbufferedinputstream.h>
G_BEGIN_DECLS
@@ -46,7 +45,6 @@
* An implementation of #GBufferedInputStream that allows for high-level
* data manipulation of arbitrary data (including binary operations).
**/
-typedef struct _GDataInputStream GDataInputStream;
typedef struct _GDataInputStreamClass GDataInputStreamClass;
typedef struct _GDataInputStreamPrivate GDataInputStreamPrivate;
@@ -70,38 +68,6 @@
void (*_g_reserved5) (void);
};
-/**
- * GDataStreamByteOrder:
- * @G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN: Selects Big Endian byte order.
- * @G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN: Selects Little Endian byte order.
- * @G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN: Selects endianness based on host machine's architecture.
- *
- * #GDataStreamByteOrder is used to ensure proper endianness of streaming data sources
- * across various machine architectures.
- *
- **/
-typedef enum {
- G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN,
- G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN,
- G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN
-} GDataStreamByteOrder;
-
-/**
- * GDataStreamNewlineType:
- * @G_DATA_STREAM_NEWLINE_TYPE_LF: Selects "LF" line endings, common on most modern UNIX platforms.
- * @G_DATA_STREAM_NEWLINE_TYPE_CR: Selects "CR" line endings.
- * @G_DATA_STREAM_NEWLINE_TYPE_CR_LF: Selects "CR, LF" line ending, common on Microsoft Windows.
- * @G_DATA_STREAM_NEWLINE_TYPE_ANY: Automatically try to handle any line ending type.
- *
- * #GDataStreamNewlineType is used when checking for or setting the line endings for a given file.
- **/
-typedef enum {
- G_DATA_STREAM_NEWLINE_TYPE_LF,
- G_DATA_STREAM_NEWLINE_TYPE_CR,
- G_DATA_STREAM_NEWLINE_TYPE_CR_LF,
- G_DATA_STREAM_NEWLINE_TYPE_ANY
-} GDataStreamNewlineType;
-
GType g_data_input_stream_get_type (void) G_GNUC_CONST;
GDataInputStream* g_data_input_stream_new (GInputStream *base_stream);
Modified: trunk/gio/gdataoutputstream.h
==============================================================================
--- trunk/gio/gdataoutputstream.h (original)
+++ trunk/gio/gdataoutputstream.h Tue Jul 1 06:32:35 2008
@@ -27,9 +27,7 @@
#ifndef __G_DATA_OUTPUT_STREAM_H__
#define __G_DATA_OUTPUT_STREAM_H__
-#include <glib-object.h>
#include <gio/gfilteroutputstream.h>
-#include <gio/gdatainputstream.h>
G_BEGIN_DECLS
Modified: trunk/gio/gdesktopappinfo.c
==============================================================================
--- trunk/gio/gdesktopappinfo.c (original)
+++ trunk/gio/gdesktopappinfo.c Tue Jul 1 06:32:35 2008
@@ -34,12 +34,14 @@
#include "gcontenttypeprivate.h"
#include "gdesktopappinfo.h"
+#include "gfile.h"
#include "gioerror.h"
#include "gthemedicon.h"
#include "gfileicon.h"
#include <glib/gstdio.h>
#include "glibintl.h"
#include "giomodule-priv.h"
+#include "gappinfo.h"
#include "gioalias.h"
Modified: trunk/gio/gdrive.c
==============================================================================
--- trunk/gio/gdrive.c (original)
+++ trunk/gio/gdrive.c Tue Jul 1 06:32:35 2008
@@ -24,6 +24,8 @@
#include "config.h"
#include "gdrive.h"
#include "gsimpleasyncresult.h"
+#include "gasyncresult.h"
+#include "gioerror.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gdrive.h
==============================================================================
--- trunk/gio/gdrive.h (original)
+++ trunk/gio/gdrive.h Tue Jul 1 06:32:35 2008
@@ -28,10 +28,7 @@
#ifndef __G_DRIVE_H__
#define __G_DRIVE_H__
-#include <glib-object.h>
-#include <gio/gmount.h>
-#include <gio/gvolume.h>
-#include <gio/gmountoperation.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
Modified: trunk/gio/gdummyfile.c
==============================================================================
--- trunk/gio/gdummyfile.c (original)
+++ trunk/gio/gdummyfile.c Tue Jul 1 06:32:35 2008
@@ -33,6 +33,7 @@
#include <stdlib.h>
#include "gdummyfile.h"
+#include "gfile.h"
#include "gioalias.h"
Modified: trunk/gio/gdummyfile.h
==============================================================================
--- trunk/gio/gdummyfile.h (original)
+++ trunk/gio/gdummyfile.h Tue Jul 1 06:32:35 2008
@@ -23,7 +23,7 @@
#ifndef __G_DUMMY_FILE_H__
#define __G_DUMMY_FILE_H__
-#include <gio/gfile.h>
+#include <gio/gio.h>
G_BEGIN_DECLS
Modified: trunk/gio/gfile.c
==============================================================================
--- trunk/gio/gfile.c (original)
+++ trunk/gio/gfile.c Tue Jul 1 06:32:35 2008
@@ -35,6 +35,12 @@
#include "gsimpleasyncresult.h"
#include "gfileattribute-priv.h"
#include "gpollfilemonitor.h"
+#include "gappinfo.h"
+#include "gfileinputstream.h"
+#include "gfileoutputstream.h"
+#include "gcancellable.h"
+#include "gasyncresult.h"
+#include "gioerror.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gfile.h
==============================================================================
--- trunk/gio/gfile.h (original)
+++ trunk/gio/gfile.h Tue Jul 1 06:32:35 2008
@@ -27,13 +27,7 @@
#ifndef __G_FILE_H__
#define __G_FILE_H__
-#include <glib-object.h>
-#include <gio/gfileinfo.h>
-#include <gio/gfileenumerator.h>
-#include <gio/gfileinputstream.h>
-#include <gio/gfileoutputstream.h>
-#include <gio/gmountoperation.h>
-#include <gio/gappinfo.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -42,88 +36,6 @@
#define G_IS_FILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_FILE))
#define G_FILE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_FILE, GFileIface))
-/**
- * GFileQueryInfoFlags:
- * @G_FILE_QUERY_INFO_NONE: No flags set.
- * @G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS: Don't follow symlinks.
- *
- * Flags used when querying a #GFileInfo.
- */
-typedef enum {
- G_FILE_QUERY_INFO_NONE = 0,
- G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS = (1<<0) /*< nick=nofollow-symlinks >*/
-} GFileQueryInfoFlags;
-
-/**
- * GFileCreateFlags:
- * @G_FILE_CREATE_NONE: No flags set.
- * @G_FILE_CREATE_PRIVATE: Create a file that can only be
- * accessed by the current user.
- *
- * Flags used when an operation may create a file.
- */
-typedef enum {
- G_FILE_CREATE_NONE = 0,
- G_FILE_CREATE_PRIVATE = (1<<0)
-} GFileCreateFlags;
-
-
-/**
- * GMountMountFlags:
- * @G_MOUNT_MOUNT_NONE: No flags set.
- *
- * Flags used when mounting a mount.
- */
-typedef enum {
- G_MOUNT_MOUNT_NONE = 0
-} GMountMountFlags;
-
-
-/**
- * GMountUnmountFlags:
- * @G_MOUNT_UNMOUNT_NONE: No flags set.
- * @G_MOUNT_UNMOUNT_FORCE: Unmount even if there are outstanding
- * file operations on the mount.
- *
- * Flags used when an unmounting a mount.
- */
-typedef enum {
- G_MOUNT_UNMOUNT_NONE = 0,
- G_MOUNT_UNMOUNT_FORCE = (1<<0)
-} GMountUnmountFlags;
-
-/**
- * GFileCopyFlags:
- * @G_FILE_COPY_NONE: No flags set.
- * @G_FILE_COPY_OVERWRITE: Overwrite any existing files
- * @G_FILE_COPY_BACKUP: Make a backup of any existing files.
- * @G_FILE_COPY_NOFOLLOW_SYMLINKS: Don't follow symlinks.
- * @G_FILE_COPY_ALL_METADATA: Copy all file metadata instead of just default set used for copy (see #GFileInfo).
- * @G_FILE_COPY_NO_FALLBACK_FOR_MOVE: Don't use copy and delete fallback if native move not supported.
- *
- * Flags used when copying or moving files.
- */
-typedef enum {
- G_FILE_COPY_NONE = 0, /*< nick=none >*/
- G_FILE_COPY_OVERWRITE = (1<<0),
- G_FILE_COPY_BACKUP = (1<<1),
- G_FILE_COPY_NOFOLLOW_SYMLINKS = (1<<2),
- G_FILE_COPY_ALL_METADATA = (1<<3),
- G_FILE_COPY_NO_FALLBACK_FOR_MOVE = (1<<4)
-} GFileCopyFlags;
-
-/**
- * GFileMonitorFlags:
- * @G_FILE_MONITOR_NONE: No flags set.
- * @G_FILE_MONITOR_WATCH_MOUNTS: Watch for mount events.
- *
- * Flags used to set what a #GFileMonitor will watch for.
- */
-typedef enum {
- G_FILE_MONITOR_NONE = 0,
- G_FILE_MONITOR_WATCH_MOUNTS = (1<<0)
-} GFileMonitorFlags;
-
#if 0
/**
* GFile:
@@ -135,45 +47,7 @@
typedef struct _GFile GFile; /* Dummy typedef */
#endif
typedef struct _GFileIface GFileIface;
-typedef struct _GFileMonitor GFileMonitor;
-/**
- * GMount:
- *
- * A handle to an object implementing the #GMountIface interface.
- **/
-typedef struct _GMount GMount; /* Dummy typedef */
-
-/**
- * GFileProgressCallback:
- * @current_num_bytes: the current number of bytes in the operation.
- * @total_num_bytes: the total number of bytes in the operation.
- * @user_data: user data passed to the callback.
- *
- * When doing file operations that may take a while, such as moving
- * a file or copying a file, a progress callback is used to pass how
- * far along that operation is to the application.
- **/
-typedef void (*GFileProgressCallback) (goffset current_num_bytes,
- goffset total_num_bytes,
- gpointer user_data);
-
-/**
- * GFileReadMoreCallback:
- * @file_contents: the data as currently read.
- * @file_size: the size of the data currently read.
- * @callback_data: data passed to the callback.
- *
- * When loading the partial contents of a file with g_file_read_partial_contents(),
- * it may become necessary to determine if any more data from the file should be loaded.
- * A #GFileReadMoreCallback function facilitates this by returning %TRUE if more data
- * should be read, or %FALSE otherwise.
- *
- * Returns: %TRUE if more data should be read back. %FALSE otherwise.
- **/
-typedef gboolean (* GFileReadMoreCallback) (const char *file_contents,
- goffset file_size,
- gpointer callback_data);
/**
* GFileIface:
Modified: trunk/gio/gfileattribute.h
==============================================================================
--- trunk/gio/gfileattribute.h (original)
+++ trunk/gio/gfileattribute.h Tue Jul 1 06:32:35 2008
@@ -27,65 +27,11 @@
#ifndef __G_FILE_ATTRIBUTE_H__
#define __G_FILE_ATTRIBUTE_H__
-#include <glib-object.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
/**
- * GFileAttributeType:
- * @G_FILE_ATTRIBUTE_TYPE_INVALID: indicates an invalid or uninitalized type.
- * @G_FILE_ATTRIBUTE_TYPE_STRING: a null terminated UTF8 string.
- * @G_FILE_ATTRIBUTE_TYPE_BYTE_STRING: a zero terminated string of non-zero bytes.
- * @G_FILE_ATTRIBUTE_TYPE_BOOLEAN: a boolean value.
- * @G_FILE_ATTRIBUTE_TYPE_UINT32: an unsigned 4-byte/32-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_INT32: a signed 4-byte/32-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_UINT64: an unsigned 8-byte/64-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_INT64: a signed 8-byte/64-bit integer.
- * @G_FILE_ATTRIBUTE_TYPE_OBJECT: a #GObject.
- *
- * The data types for file attributes.
- **/
-typedef enum {
- G_FILE_ATTRIBUTE_TYPE_INVALID = 0,
- G_FILE_ATTRIBUTE_TYPE_STRING,
- G_FILE_ATTRIBUTE_TYPE_BYTE_STRING, /* zero terminated string of non-zero bytes */
- G_FILE_ATTRIBUTE_TYPE_BOOLEAN,
- G_FILE_ATTRIBUTE_TYPE_UINT32,
- G_FILE_ATTRIBUTE_TYPE_INT32,
- G_FILE_ATTRIBUTE_TYPE_UINT64,
- G_FILE_ATTRIBUTE_TYPE_INT64,
- G_FILE_ATTRIBUTE_TYPE_OBJECT
-} GFileAttributeType;
-
-/**
- * GFileAttributeInfoFlags:
- * @G_FILE_ATTRIBUTE_INFO_NONE: no flags set.
- * @G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE: copy the attribute values when the file is copied.
- * @G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED: copy the attribute values when the file is moved.
- *
- * Flags specifying the behaviour of an attribute.
- **/
-typedef enum {
- G_FILE_ATTRIBUTE_INFO_NONE = 0,
- G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE = 1 << 0,
- G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED = 1 << 1
-} GFileAttributeInfoFlags;
-
-/**
- * GFileAttributeStatus:
- * @G_FILE_ATTRIBUTE_STATUS_UNSET: Attribute value is unset (empty).
- * @G_FILE_ATTRIBUTE_STATUS_SET: Attribute value is set.
- * @G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING: Indicates an error in setting the value.
- *
- * Used by g_file_set_attributes_from_info() when setting file attributes.
- **/
-typedef enum {
- G_FILE_ATTRIBUTE_STATUS_UNSET = 0,
- G_FILE_ATTRIBUTE_STATUS_SET,
- G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING
-} GFileAttributeStatus;
-
-/**
* GFileAttributeInfo:
* @name: the name of the attribute.
* @type: the #GFileAttributeType type of the attribute.
@@ -93,11 +39,11 @@
*
* Information about a specific attribute.
**/
-typedef struct {
+struct _GFileAttributeInfo {
char *name;
GFileAttributeType type;
GFileAttributeInfoFlags flags;
-} GFileAttributeInfo;
+};
/**
* GFileAttributeInfoList:
@@ -107,10 +53,10 @@
* Acts as a lightweight registry for possible valid file attributes.
* The registry stores Key-Value pair formats as #GFileAttributeInfo<!-- -->s.
**/
-typedef struct {
+struct _GFileAttributeInfoList {
GFileAttributeInfo *infos;
int n_infos;
-} GFileAttributeInfoList;
+};
GFileAttributeInfoList * g_file_attribute_info_list_new (void);
GFileAttributeInfoList * g_file_attribute_info_list_ref (GFileAttributeInfoList *list);
Modified: trunk/gio/gfileenumerator.c
==============================================================================
--- trunk/gio/gfileenumerator.c (original)
+++ trunk/gio/gfileenumerator.c Tue Jul 1 06:32:35 2008
@@ -22,9 +22,12 @@
#include "config.h"
#include "gfileenumerator.h"
+#include "gfile.h"
#include "gioscheduler.h"
+#include "gasyncresult.h"
#include "gasynchelper.h"
#include "gsimpleasyncresult.h"
+#include "gioerror.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gfileenumerator.h
==============================================================================
--- trunk/gio/gfileenumerator.h (original)
+++ trunk/gio/gfileenumerator.h Tue Jul 1 06:32:35 2008
@@ -27,11 +27,7 @@
#ifndef __G_FILE_ENUMERATOR_H__
#define __G_FILE_ENUMERATOR_H__
-#include <glib-object.h>
-#include <gio/gioerror.h>
-#include <gio/gcancellable.h>
-#include <gio/gfileinfo.h>
-#include <gio/gasyncresult.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -49,22 +45,9 @@
*
* A per matched file iterator.
**/
-typedef struct _GFileEnumerator GFileEnumerator;
typedef struct _GFileEnumeratorClass GFileEnumeratorClass;
typedef struct _GFileEnumeratorPrivate GFileEnumeratorPrivate;
-/* Nasty */
-GType g_file_get_type (void) G_GNUC_CONST;
-#define G_TYPE_FILE (g_file_get_type ())
-/**
- * GFile:
- *
- * A handle to an object implementing the #GFileIface interface.
- * Generally stores a location within the file system. Handles do not
- * necessarily represent files or directories that currently exist.
- **/
-typedef struct _GFile GFile; /* Dummy typedef */
-
struct _GFileEnumerator
{
GObject parent_instance;
Modified: trunk/gio/gfileicon.c
==============================================================================
--- trunk/gio/gfileicon.c (original)
+++ trunk/gio/gfileicon.c Tue Jul 1 06:32:35 2008
@@ -23,6 +23,10 @@
#include "config.h"
#include "gfileicon.h"
+#include "gfile.h"
+#include "gicon.h"
+#include "gloadableicon.h"
+#include "ginputstream.h"
#include "gsimpleasyncresult.h"
#include "gioalias.h"
Modified: trunk/gio/gfileicon.h
==============================================================================
--- trunk/gio/gfileicon.h (original)
+++ trunk/gio/gfileicon.h Tue Jul 1 06:32:35 2008
@@ -27,8 +27,7 @@
#ifndef __G_FILE_ICON_H__
#define __G_FILE_ICON_H__
-#include <gio/gloadableicon.h>
-#include <gio/gfile.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -44,7 +43,6 @@
*
* Gets an icon for a #GFile. Implements #GLoadableIcon.
**/
-typedef struct _GFileIcon GFileIcon;
typedef struct _GFileIconClass GFileIconClass;
GType g_file_icon_get_type (void) G_GNUC_CONST;
Modified: trunk/gio/gfileinfo.c
==============================================================================
--- trunk/gio/gfileinfo.c (original)
+++ trunk/gio/gfileinfo.c Tue Jul 1 06:32:35 2008
@@ -58,6 +58,7 @@
#include "gfileinfo.h"
#include "gfileattribute-priv.h"
+#include "gicon.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gfileinfo.h
==============================================================================
--- trunk/gio/gfileinfo.h (original)
+++ trunk/gio/gfileinfo.h Tue Jul 1 06:32:35 2008
@@ -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 @@
*
* 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: */
/**
Modified: trunk/gio/gfileinputstream.c
==============================================================================
--- trunk/gio/gfileinputstream.c (original)
+++ trunk/gio/gfileinputstream.c Tue Jul 1 06:32:35 2008
@@ -26,6 +26,9 @@
#include <gfileinputstream.h>
#include <gseekable.h>
#include "gsimpleasyncresult.h"
+#include "gcancellable.h"
+#include "gasyncresult.h"
+#include "gioerror.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gfileinputstream.h
==============================================================================
--- trunk/gio/gfileinputstream.h (original)
+++ trunk/gio/gfileinputstream.h Tue Jul 1 06:32:35 2008
@@ -28,7 +28,6 @@
#define __G_FILE_INPUT_STREAM_H__
#include <gio/ginputstream.h>
-#include <gio/gfileinfo.h>
G_BEGIN_DECLS
@@ -47,7 +46,6 @@
*
* #GFileInputStream implements #GSeekable.
**/
-typedef struct _GFileInputStream GFileInputStream;
typedef struct _GFileInputStreamClass GFileInputStreamClass;
typedef struct _GFileInputStreamPrivate GFileInputStreamPrivate;
Modified: trunk/gio/gfilemonitor.c
==============================================================================
--- trunk/gio/gfilemonitor.c (original)
+++ trunk/gio/gfilemonitor.c Tue Jul 1 06:32:35 2008
@@ -26,6 +26,7 @@
#include "gfilemonitor.h"
#include "gio-marshal.h"
#include "gioenumtypes.h"
+#include "gfile.h"
#include "gvfs.h"
#include "glibintl.h"
Modified: trunk/gio/gfilemonitor.h
==============================================================================
--- trunk/gio/gfilemonitor.h (original)
+++ trunk/gio/gfilemonitor.h Tue Jul 1 06:32:35 2008
@@ -27,8 +27,7 @@
#ifndef __G_FILE_MONITOR_H__
#define __G_FILE_MONITOR_H__
-#include <glib-object.h>
-#include <gio/gfile.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -39,29 +38,7 @@
#define G_IS_FILE_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_FILE_MONITOR))
#define G_FILE_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_FILE_MONITOR, GFileMonitorClass))
-/**
- * GFileMonitorEvent:
- * @G_FILE_MONITOR_EVENT_CHANGED: a file changed.
- * @G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: a hint that this was probably the last change in a set of changes.
- * @G_FILE_MONITOR_EVENT_DELETED: a file was deleted.
- * @G_FILE_MONITOR_EVENT_CREATED: a file was created.
- * @G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: a file attribute was changed.
- * @G_FILE_MONITOR_EVENT_PRE_UNMOUNT: the file location will soon be unmounted.
- * @G_FILE_MONITOR_EVENT_UNMOUNTED: the file location was unmounted.
- *
- * Specifies what type of event a monitor event is.
- **/
-typedef enum {
- G_FILE_MONITOR_EVENT_CHANGED,
- G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT,
- G_FILE_MONITOR_EVENT_DELETED,
- G_FILE_MONITOR_EVENT_CREATED,
- G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED,
- G_FILE_MONITOR_EVENT_PRE_UNMOUNT,
- G_FILE_MONITOR_EVENT_UNMOUNTED
-} GFileMonitorEvent;
-
-typedef struct _GFileMonitorClass GFileMonitorClass;
+typedef struct _GFileMonitorClass GFileMonitorClass;
typedef struct _GFileMonitorPrivate GFileMonitorPrivate;
/**
Modified: trunk/gio/gfilenamecompleter.c
==============================================================================
--- trunk/gio/gfilenamecompleter.c (original)
+++ trunk/gio/gfilenamecompleter.c Tue Jul 1 06:32:35 2008
@@ -22,7 +22,11 @@
#include "config.h"
#include "gfilenamecompleter.h"
+#include "gfileenumerator.h"
+#include "gfileattribute.h"
#include "gfile.h"
+#include "gfileinfo.h"
+#include "gcancellable.h"
#include <string.h>
#include "glibintl.h"
Modified: trunk/gio/gfilenamecompleter.h
==============================================================================
--- trunk/gio/gfilenamecompleter.h (original)
+++ trunk/gio/gfilenamecompleter.h Tue Jul 1 06:32:35 2008
@@ -27,7 +27,7 @@
#ifndef __G_FILENAME_COMPLETER_H__
#define __G_FILENAME_COMPLETER_H__
-#include <glib-object.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -43,7 +43,6 @@
*
* Completes filenames based on files that exist within the file system.
**/
-typedef struct _GFilenameCompleter GFilenameCompleter;
typedef struct _GFilenameCompleterClass GFilenameCompleterClass;
struct _GFilenameCompleterClass {
Modified: trunk/gio/gfileoutputstream.c
==============================================================================
--- trunk/gio/gfileoutputstream.c (original)
+++ trunk/gio/gfileoutputstream.c Tue Jul 1 06:32:35 2008
@@ -26,6 +26,9 @@
#include <gfileoutputstream.h>
#include <gseekable.h>
#include "gsimpleasyncresult.h"
+#include "gasyncresult.h"
+#include "gcancellable.h"
+#include "gioerror.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gfileoutputstream.h
==============================================================================
--- trunk/gio/gfileoutputstream.h (original)
+++ trunk/gio/gfileoutputstream.h Tue Jul 1 06:32:35 2008
@@ -28,7 +28,6 @@
#define __G_FILE_OUTPUT_STREAM_H__
#include <gio/goutputstream.h>
-#include <gio/gfileinfo.h>
G_BEGIN_DECLS
@@ -47,7 +46,6 @@
*
* #GFileOutputStream implements GSeekable.
**/
-typedef struct _GFileOutputStream GFileOutputStream;
typedef struct _GFileOutputStreamClass GFileOutputStreamClass;
typedef struct _GFileOutputStreamPrivate GFileOutputStreamPrivate;
Modified: trunk/gio/gfilterinputstream.h
==============================================================================
--- trunk/gio/gfilterinputstream.h (original)
+++ trunk/gio/gfilterinputstream.h Tue Jul 1 06:32:35 2008
@@ -27,7 +27,6 @@
#ifndef __G_FILTER_INPUT_STREAM_H__
#define __G_FILTER_INPUT_STREAM_H__
-#include <glib-object.h>
#include <gio/ginputstream.h>
G_BEGIN_DECLS
@@ -44,7 +43,6 @@
*
* A base class for all input streams that work on an underlying stream.
**/
-typedef struct _GFilterInputStream GFilterInputStream;
typedef struct _GFilterInputStreamClass GFilterInputStreamClass;
typedef struct _GFilterInputStreamPrivate GFilterInputStreamPrivate;
Modified: trunk/gio/gfilteroutputstream.h
==============================================================================
--- trunk/gio/gfilteroutputstream.h (original)
+++ trunk/gio/gfilteroutputstream.h Tue Jul 1 06:32:35 2008
@@ -27,7 +27,6 @@
#ifndef __G_FILTER_OUTPUT_STREAM_H__
#define __G_FILTER_OUTPUT_STREAM_H__
-#include <glib-object.h>
#include <gio/goutputstream.h>
G_BEGIN_DECLS
@@ -44,7 +43,6 @@
*
* A base class for all output streams that work on an underlying stream.
**/
-typedef struct _GFilterOutputStream GFilterOutputStream;
typedef struct _GFilterOutputStreamClass GFilterOutputStreamClass;
typedef struct _GFilterOutputStreamPrivate GFilterOutputStreamPrivate;
Modified: trunk/gio/gicon.h
==============================================================================
--- trunk/gio/gicon.h (original)
+++ trunk/gio/gicon.h Tue Jul 1 06:32:35 2008
@@ -27,7 +27,7 @@
#ifndef __G_ICON_H__
#define __G_ICON_H__
-#include <glib-object.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -41,7 +41,6 @@
*
* An abstract type that specifies an icon.
**/
-typedef struct _GIcon GIcon; /* Dummy typedef */
typedef struct _GIconIface GIconIface;
/**
Modified: trunk/gio/ginputstream.c
==============================================================================
--- trunk/gio/ginputstream.c (original)
+++ trunk/gio/ginputstream.c Tue Jul 1 06:32:35 2008
@@ -26,7 +26,10 @@
#include "ginputstream.h"
#include "gseekable.h"
+#include "gcancellable.h"
+#include "gasyncresult.h"
#include "gsimpleasyncresult.h"
+#include "gioerror.h"
#include "gioalias.h"
Modified: trunk/gio/ginputstream.h
==============================================================================
--- trunk/gio/ginputstream.h (original)
+++ trunk/gio/ginputstream.h Tue Jul 1 06:32:35 2008
@@ -27,10 +27,7 @@
#ifndef __G_INPUT_STREAM_H__
#define __G_INPUT_STREAM_H__
-#include <glib-object.h>
-#include <gio/gioerror.h>
-#include <gio/gcancellable.h>
-#include <gio/gasyncresult.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -46,7 +43,6 @@
*
* Base class for streaming input operations.
**/
-typedef struct _GInputStream GInputStream;
typedef struct _GInputStreamClass GInputStreamClass;
typedef struct _GInputStreamPrivate GInputStreamPrivate;
Modified: trunk/gio/gio.h
==============================================================================
--- trunk/gio/gio.h (original)
+++ trunk/gio/gio.h Tue Jul 1 06:32:35 2008
@@ -25,31 +25,47 @@
#define __GIO_GIO_H_INSIDE__
-#include <gio/gvfs.h>
-#include <gio/gfile.h>
-#include <gio/gvolumemonitor.h>
-#include <gio/gcontenttype.h>
+#include <gio/giotypes.h>
+
#include <gio/gappinfo.h>
-#include <gio/gicon.h>
-#include <gio/gfileicon.h>
-#include <gio/gloadableicon.h>
-#include <gio/gthemedicon.h>
-#include <gio/gseekable.h>
-#include <gio/gfilemonitor.h>
+#include <gio/gasyncresult.h>
#include <gio/gbufferedinputstream.h>
#include <gio/gbufferedoutputstream.h>
+#include <gio/gcancellable.h>
+#include <gio/gcontenttype.h>
#include <gio/gdatainputstream.h>
#include <gio/gdataoutputstream.h>
+#include <gio/gdrive.h>
+#include <gio/gfile.h>
+#include <gio/gfileattribute.h>
+#include <gio/gfileenumerator.h>
+#include <gio/gfileicon.h>
+#include <gio/gfileinfo.h>
+#include <gio/gfileinputstream.h>
+#include <gio/gfilemonitor.h>
#include <gio/gfilenamecompleter.h>
+#include <gio/gfileoutputstream.h>
#include <gio/gfilterinputstream.h>
#include <gio/gfilteroutputstream.h>
+#include <gio/gicon.h>
+#include <gio/ginputstream.h>
+#include <gio/gioenumtypes.h>
+#include <gio/gioerror.h>
#include <gio/giomodule.h>
#include <gio/gioscheduler.h>
+#include <gio/gloadableicon.h>
#include <gio/gmemoryinputstream.h>
#include <gio/gmemoryoutputstream.h>
-#include <gio/gsimpleasyncresult.h>
-#include <gio/gioenumtypes.h>
+#include <gio/gmount.h>
+#include <gio/gmountoperation.h>
#include <gio/gnativevolumemonitor.h>
+#include <gio/goutputstream.h>
+#include <gio/gseekable.h>
+#include <gio/gsimpleasyncresult.h>
+#include <gio/gthemedicon.h>
+#include <gio/gvfs.h>
+#include <gio/gvolume.h>
+#include <gio/gvolumemonitor.h>
#undef __GIO_GIO_H_INSIDE__
Added: trunk/gio/gioenums.h
==============================================================================
--- (empty file)
+++ trunk/gio/gioenums.h Tue Jul 1 06:32:35 2008
@@ -0,0 +1,443 @@
+/* GIO - GLib Input, Output and Streaming Library
+ *
+ * Copyright (C) 2006-2007 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Alexander Larsson <alexl redhat com>
+ */
+
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
+#ifndef __GIO_ENUMS_H__
+#define __GIO_ENUMS_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+
+/**
+ * GAppInfoCreateFlags:
+ * @G_APP_INFO_CREATE_NONE: No flags.
+ * @G_APP_INFO_CREATE_NEEDS_TERMINAL: Application opens in a terminal window.
+ * @G_APP_INFO_CREATE_SUPPORTS_URIS: Application supports URI arguments.
+ *
+ * Flags used when creating a #GAppInfo.
+ */
+typedef enum {
+ G_APP_INFO_CREATE_NONE = 0, /*< nick=none >*/
+ G_APP_INFO_CREATE_NEEDS_TERMINAL = (1 << 0), /*< nick=needs-terminal >*/
+ G_APP_INFO_CREATE_SUPPORTS_URIS = (1 << 1) /*< nick=supports-uris >*/
+} GAppInfoCreateFlags;
+
+
+/**
+ * GDataStreamByteOrder:
+ * @G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN: Selects Big Endian byte order.
+ * @G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN: Selects Little Endian byte order.
+ * @G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN: Selects endianness based on host machine's architecture.
+ *
+ * #GDataStreamByteOrder is used to ensure proper endianness of streaming data sources
+ * across various machine architectures.
+ *
+ **/
+typedef enum {
+ G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN,
+ G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN,
+ G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN
+} GDataStreamByteOrder;
+
+
+/**
+ * GDataStreamNewlineType:
+ * @G_DATA_STREAM_NEWLINE_TYPE_LF: Selects "LF" line endings, common on most modern UNIX platforms.
+ * @G_DATA_STREAM_NEWLINE_TYPE_CR: Selects "CR" line endings.
+ * @G_DATA_STREAM_NEWLINE_TYPE_CR_LF: Selects "CR, LF" line ending, common on Microsoft Windows.
+ * @G_DATA_STREAM_NEWLINE_TYPE_ANY: Automatically try to handle any line ending type.
+ *
+ * #GDataStreamNewlineType is used when checking for or setting the line endings for a given file.
+ **/
+typedef enum {
+ G_DATA_STREAM_NEWLINE_TYPE_LF,
+ G_DATA_STREAM_NEWLINE_TYPE_CR,
+ G_DATA_STREAM_NEWLINE_TYPE_CR_LF,
+ G_DATA_STREAM_NEWLINE_TYPE_ANY
+} GDataStreamNewlineType;
+
+
+/**
+ * GFileAttributeType:
+ * @G_FILE_ATTRIBUTE_TYPE_INVALID: indicates an invalid or uninitalized type.
+ * @G_FILE_ATTRIBUTE_TYPE_STRING: a null terminated UTF8 string.
+ * @G_FILE_ATTRIBUTE_TYPE_BYTE_STRING: a zero terminated string of non-zero bytes.
+ * @G_FILE_ATTRIBUTE_TYPE_BOOLEAN: a boolean value.
+ * @G_FILE_ATTRIBUTE_TYPE_UINT32: an unsigned 4-byte/32-bit integer.
+ * @G_FILE_ATTRIBUTE_TYPE_INT32: a signed 4-byte/32-bit integer.
+ * @G_FILE_ATTRIBUTE_TYPE_UINT64: an unsigned 8-byte/64-bit integer.
+ * @G_FILE_ATTRIBUTE_TYPE_INT64: a signed 8-byte/64-bit integer.
+ * @G_FILE_ATTRIBUTE_TYPE_OBJECT: a #GObject.
+ *
+ * The data types for file attributes.
+ **/
+typedef enum {
+ G_FILE_ATTRIBUTE_TYPE_INVALID = 0,
+ G_FILE_ATTRIBUTE_TYPE_STRING,
+ G_FILE_ATTRIBUTE_TYPE_BYTE_STRING, /* zero terminated string of non-zero bytes */
+ G_FILE_ATTRIBUTE_TYPE_BOOLEAN,
+ G_FILE_ATTRIBUTE_TYPE_UINT32,
+ G_FILE_ATTRIBUTE_TYPE_INT32,
+ G_FILE_ATTRIBUTE_TYPE_UINT64,
+ G_FILE_ATTRIBUTE_TYPE_INT64,
+ G_FILE_ATTRIBUTE_TYPE_OBJECT
+} GFileAttributeType;
+
+
+/**
+ * GFileAttributeInfoFlags:
+ * @G_FILE_ATTRIBUTE_INFO_NONE: no flags set.
+ * @G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE: copy the attribute values when the file is copied.
+ * @G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED: copy the attribute values when the file is moved.
+ *
+ * Flags specifying the behaviour of an attribute.
+ **/
+typedef enum {
+ G_FILE_ATTRIBUTE_INFO_NONE = 0,
+ G_FILE_ATTRIBUTE_INFO_COPY_WITH_FILE = (1 << 0),
+ G_FILE_ATTRIBUTE_INFO_COPY_WHEN_MOVED = (1 << 1)
+} GFileAttributeInfoFlags;
+
+
+/**
+ * GFileAttributeStatus:
+ * @G_FILE_ATTRIBUTE_STATUS_UNSET: Attribute value is unset (empty).
+ * @G_FILE_ATTRIBUTE_STATUS_SET: Attribute value is set.
+ * @G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING: Indicates an error in setting the value.
+ *
+ * Used by g_file_set_attributes_from_info() when setting file attributes.
+ **/
+typedef enum {
+ G_FILE_ATTRIBUTE_STATUS_UNSET = 0,
+ G_FILE_ATTRIBUTE_STATUS_SET,
+ G_FILE_ATTRIBUTE_STATUS_ERROR_SETTING
+} GFileAttributeStatus;
+
+
+/**
+ * GFileQueryInfoFlags:
+ * @G_FILE_QUERY_INFO_NONE: No flags set.
+ * @G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS: Don't follow symlinks.
+ *
+ * Flags used when querying a #GFileInfo.
+ */
+typedef enum {
+ G_FILE_QUERY_INFO_NONE = 0,
+ G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS = (1 << 0) /*< nick=nofollow-symlinks >*/
+} GFileQueryInfoFlags;
+
+
+/**
+ * GFileCreateFlags:
+ * @G_FILE_CREATE_NONE: No flags set.
+ * @G_FILE_CREATE_PRIVATE: Create a file that can only be
+ * accessed by the current user.
+ *
+ * Flags used when an operation may create a file.
+ */
+typedef enum {
+ G_FILE_CREATE_NONE = 0,
+ G_FILE_CREATE_PRIVATE = (1 << 0)
+} GFileCreateFlags;
+
+
+/**
+ * GMountMountFlags:
+ * @G_MOUNT_MOUNT_NONE: No flags set.
+ *
+ * Flags used when mounting a mount.
+ */
+typedef enum {
+ G_MOUNT_MOUNT_NONE = 0
+} GMountMountFlags;
+
+
+/**
+ * GMountUnmountFlags:
+ * @G_MOUNT_UNMOUNT_NONE: No flags set.
+ * @G_MOUNT_UNMOUNT_FORCE: Unmount even if there are outstanding
+ * file operations on the mount.
+ *
+ * Flags used when an unmounting a mount.
+ */
+typedef enum {
+ G_MOUNT_UNMOUNT_NONE = 0,
+ G_MOUNT_UNMOUNT_FORCE = (1 << 0)
+} GMountUnmountFlags;
+
+
+/**
+ * GFileCopyFlags:
+ * @G_FILE_COPY_NONE: No flags set.
+ * @G_FILE_COPY_OVERWRITE: Overwrite any existing files
+ * @G_FILE_COPY_BACKUP: Make a backup of any existing files.
+ * @G_FILE_COPY_NOFOLLOW_SYMLINKS: Don't follow symlinks.
+ * @G_FILE_COPY_ALL_METADATA: Copy all file metadata instead of just default set used for copy (see #GFileInfo).
+ * @G_FILE_COPY_NO_FALLBACK_FOR_MOVE: Don't use copy and delete fallback if native move not supported.
+ *
+ * Flags used when copying or moving files.
+ */
+typedef enum {
+ G_FILE_COPY_NONE = 0, /*< nick=none >*/
+ G_FILE_COPY_OVERWRITE = (1 << 0),
+ G_FILE_COPY_BACKUP = (1 << 1),
+ G_FILE_COPY_NOFOLLOW_SYMLINKS = (1 << 2),
+ G_FILE_COPY_ALL_METADATA = (1 << 3),
+ G_FILE_COPY_NO_FALLBACK_FOR_MOVE = (1 << 4)
+} GFileCopyFlags;
+
+
+/**
+ * GFileMonitorFlags:
+ * @G_FILE_MONITOR_NONE: No flags set.
+ * @G_FILE_MONITOR_WATCH_MOUNTS: Watch for mount events.
+ *
+ * Flags used to set what a #GFileMonitor will watch for.
+ */
+typedef enum {
+ G_FILE_MONITOR_NONE = 0,
+ G_FILE_MONITOR_WATCH_MOUNTS = (1 << 0)
+} GFileMonitorFlags;
+
+
+/**
+ * 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;
+
+
+/**
+ * GFileMonitorEvent:
+ * @G_FILE_MONITOR_EVENT_CHANGED: a file changed.
+ * @G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: a hint that this was probably the last change in a set of changes.
+ * @G_FILE_MONITOR_EVENT_DELETED: a file was deleted.
+ * @G_FILE_MONITOR_EVENT_CREATED: a file was created.
+ * @G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: a file attribute was changed.
+ * @G_FILE_MONITOR_EVENT_PRE_UNMOUNT: the file location will soon be unmounted.
+ * @G_FILE_MONITOR_EVENT_UNMOUNTED: the file location was unmounted.
+ *
+ * Specifies what type of event a monitor event is.
+ **/
+typedef enum {
+ G_FILE_MONITOR_EVENT_CHANGED,
+ G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT,
+ G_FILE_MONITOR_EVENT_DELETED,
+ G_FILE_MONITOR_EVENT_CREATED,
+ G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED,
+ G_FILE_MONITOR_EVENT_PRE_UNMOUNT,
+ G_FILE_MONITOR_EVENT_UNMOUNTED
+} GFileMonitorEvent;
+
+
+/* This enumeration conflicts with GIOError in giochannel.h. However,
+ * that is only used as a return value in some deprecated functions.
+ * So, we reuse the same prefix for the enumeration values, but call
+ * the actual enumeration (which is rarely used) GIOErrorEnum.
+ */
+/**
+ * GIOErrorEnum:
+ * @G_IO_ERROR_FAILED: Generic error condition for when any operation fails.
+ * @G_IO_ERROR_NOT_FOUND: File not found error.
+ * @G_IO_ERROR_EXISTS: File already exists error.
+ * @G_IO_ERROR_IS_DIRECTORY: File is a directory error.
+ * @G_IO_ERROR_NOT_DIRECTORY: File is not a directory.
+ * @G_IO_ERROR_NOT_EMPTY: File is a directory that isn't empty.
+ * @G_IO_ERROR_NOT_REGULAR_FILE: File is not a regular file.
+ * @G_IO_ERROR_NOT_SYMBOLIC_LINK: File is not a symbolic link.
+ * @G_IO_ERROR_NOT_MOUNTABLE_FILE: File cannot be mounted.
+ * @G_IO_ERROR_FILENAME_TOO_LONG: Filename is too many characters.
+ * @G_IO_ERROR_INVALID_FILENAME: Filename is invalid or contains invalid characters.
+ * @G_IO_ERROR_TOO_MANY_LINKS: File contains too many symbolic links.
+ * @G_IO_ERROR_NO_SPACE: No space left on drive.
+ * @G_IO_ERROR_INVALID_ARGUMENT: Invalid argument.
+ * @G_IO_ERROR_PERMISSION_DENIED: Permission denied.
+ * @G_IO_ERROR_NOT_SUPPORTED: Operation not supported for the current backend.
+ * @G_IO_ERROR_NOT_MOUNTED: File isn't mounted.
+ * @G_IO_ERROR_ALREADY_MOUNTED: File is already mounted.
+ * @G_IO_ERROR_CLOSED: File was closed.
+ * @G_IO_ERROR_CANCELLED: Operation was cancelled. See #GCancellable.
+ * @G_IO_ERROR_PENDING: Operations are still pending.
+ * @G_IO_ERROR_READ_ONLY: File is read only.
+ * @G_IO_ERROR_CANT_CREATE_BACKUP: Backup couldn't be created.
+ * @G_IO_ERROR_WRONG_ETAG: File's Entity Tag was incorrect.
+ * @G_IO_ERROR_TIMED_OUT: Operation timed out.
+ * @G_IO_ERROR_WOULD_RECURSE: Operation would be recursive.
+ * @G_IO_ERROR_BUSY: File is busy.
+ * @G_IO_ERROR_WOULD_BLOCK: Operation would block.
+ * @G_IO_ERROR_HOST_NOT_FOUND: Host couldn't be found (remote operations).
+ * @G_IO_ERROR_WOULD_MERGE: Operation would merge files.
+ * @G_IO_ERROR_FAILED_HANDLED: Operation failed and a helper program has already interacted with the user. Do not display any error dialog.
+ *
+ * Error codes returned by GIO functions.
+ *
+ **/
+typedef enum {
+ G_IO_ERROR_FAILED,
+ G_IO_ERROR_NOT_FOUND,
+ G_IO_ERROR_EXISTS,
+ G_IO_ERROR_IS_DIRECTORY,
+ G_IO_ERROR_NOT_DIRECTORY,
+ G_IO_ERROR_NOT_EMPTY,
+ G_IO_ERROR_NOT_REGULAR_FILE,
+ G_IO_ERROR_NOT_SYMBOLIC_LINK,
+ G_IO_ERROR_NOT_MOUNTABLE_FILE,
+ G_IO_ERROR_FILENAME_TOO_LONG,
+ G_IO_ERROR_INVALID_FILENAME,
+ G_IO_ERROR_TOO_MANY_LINKS,
+ G_IO_ERROR_NO_SPACE,
+ G_IO_ERROR_INVALID_ARGUMENT,
+ G_IO_ERROR_PERMISSION_DENIED,
+ G_IO_ERROR_NOT_SUPPORTED,
+ G_IO_ERROR_NOT_MOUNTED,
+ G_IO_ERROR_ALREADY_MOUNTED,
+ G_IO_ERROR_CLOSED,
+ G_IO_ERROR_CANCELLED,
+ G_IO_ERROR_PENDING,
+ G_IO_ERROR_READ_ONLY,
+ G_IO_ERROR_CANT_CREATE_BACKUP,
+ G_IO_ERROR_WRONG_ETAG,
+ G_IO_ERROR_TIMED_OUT,
+ G_IO_ERROR_WOULD_RECURSE,
+ G_IO_ERROR_BUSY,
+ G_IO_ERROR_WOULD_BLOCK,
+ G_IO_ERROR_HOST_NOT_FOUND,
+ G_IO_ERROR_WOULD_MERGE,
+ G_IO_ERROR_FAILED_HANDLED
+} GIOErrorEnum;
+
+
+/**
+ * GAskPasswordFlags:
+ * @G_ASK_PASSWORD_NEED_PASSWORD: operation requires a password.
+ * @G_ASK_PASSWORD_NEED_USERNAME: operation requires a username.
+ * @G_ASK_PASSWORD_NEED_DOMAIN: operation requires a domain.
+ * @G_ASK_PASSWORD_SAVING_SUPPORTED: operation supports saving settings.
+ * @G_ASK_PASSWORD_ANONYMOUS_SUPPORTED: operation supports anonymous users.
+ *
+ * #GAskPasswordFlags are used to request specific information from the
+ * user, or to notify the user of their choices in an authentication
+ * situation.
+ *
+ **/
+typedef enum {
+ G_ASK_PASSWORD_NEED_PASSWORD = (1 << 0),
+ G_ASK_PASSWORD_NEED_USERNAME = (1 << 1),
+ G_ASK_PASSWORD_NEED_DOMAIN = (1 << 2),
+ G_ASK_PASSWORD_SAVING_SUPPORTED = (1 << 3),
+ G_ASK_PASSWORD_ANONYMOUS_SUPPORTED = (1 << 4)
+} GAskPasswordFlags;
+
+
+/**
+ * GPasswordSave:
+ * @G_PASSWORD_SAVE_NEVER: never save a password.
+ * @G_PASSWORD_SAVE_FOR_SESSION: save a password for the session.
+ * @G_PASSWORD_SAVE_PERMANENTLY: save a password permanently.
+ *
+ * #GPasswordSave is used to indicate the lifespan of a saved password.
+ *
+ * #Gvfs stores passwords in the Gnome keyring when this flag allows it
+ * to, and later retrieves it again from there.
+ **/
+typedef enum {
+ G_PASSWORD_SAVE_NEVER,
+ G_PASSWORD_SAVE_FOR_SESSION,
+ G_PASSWORD_SAVE_PERMANENTLY
+} GPasswordSave;
+
+
+/**
+ * GMountOperationResult:
+ * @G_MOUNT_OPERATION_HANDLED: The request was fulfilled and the user specified data is now availible
+ * @G_MOUNT_OPERATION_ABORTED: The user requested the mount operation to be aborted
+ * @G_MOUNT_OPERATION_UNHANDLED: The request was unhandled (i.e. not implemented)
+ *
+ * #GMountOperationResult is returned as a result when a request for information
+ * is send by the mounting operation.
+ **/
+typedef enum {
+ G_MOUNT_OPERATION_HANDLED,
+ G_MOUNT_OPERATION_ABORTED,
+ G_MOUNT_OPERATION_UNHANDLED
+} GMountOperationResult;
+
+
+/**
+ * GOutputStreamSpliceFlags:
+ * @G_OUTPUT_STREAM_SPLICE_NONE: Do not close either stream.
+ * @G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE: Close the source stream after the splice.
+ * @G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET: Close the target stream after the splice.
+ *
+ * GOutputStreamSpliceFlags determine how streams should be spliced.
+ **/
+typedef enum {
+ G_OUTPUT_STREAM_SPLICE_NONE = 0,
+ G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE = (1 << 0),
+ G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET = (1 << 1)
+} GOutputStreamSpliceFlags;
+
+
+
+G_END_DECLS
+
+#endif /* __GIO_ENUMS_H__ */
Modified: trunk/gio/gioerror.h
==============================================================================
--- trunk/gio/gioerror.h (original)
+++ trunk/gio/gioerror.h Tue Jul 1 06:32:35 2008
@@ -28,6 +28,7 @@
#define __G_IO_ERROR_H__
#include <glib.h>
+#include <gio/gioenums.h>
G_BEGIN_DECLS
@@ -41,84 +42,6 @@
**/
#define G_IO_ERROR g_io_error_quark()
-/* This enumeration conflicts with GIOError in giochannel.h. However,
- * that is only used as a return value in some deprecated functions.
- * So, we reuse the same prefix for the enumeration values, but call
- * the actual enumeration (which is rarely used) GIOErrorEnum.
- */
-
-/**
- * GIOErrorEnum:
- * @G_IO_ERROR_FAILED: Generic error condition for when any operation fails.
- * @G_IO_ERROR_NOT_FOUND: File not found error.
- * @G_IO_ERROR_EXISTS: File already exists error.
- * @G_IO_ERROR_IS_DIRECTORY: File is a directory error.
- * @G_IO_ERROR_NOT_DIRECTORY: File is not a directory.
- * @G_IO_ERROR_NOT_EMPTY: File is a directory that isn't empty.
- * @G_IO_ERROR_NOT_REGULAR_FILE: File is not a regular file.
- * @G_IO_ERROR_NOT_SYMBOLIC_LINK: File is not a symbolic link.
- * @G_IO_ERROR_NOT_MOUNTABLE_FILE: File cannot be mounted.
- * @G_IO_ERROR_FILENAME_TOO_LONG: Filename is too many characters.
- * @G_IO_ERROR_INVALID_FILENAME: Filename is invalid or contains invalid characters.
- * @G_IO_ERROR_TOO_MANY_LINKS: File contains too many symbolic links.
- * @G_IO_ERROR_NO_SPACE: No space left on drive.
- * @G_IO_ERROR_INVALID_ARGUMENT: Invalid argument.
- * @G_IO_ERROR_PERMISSION_DENIED: Permission denied.
- * @G_IO_ERROR_NOT_SUPPORTED: Operation not supported for the current backend.
- * @G_IO_ERROR_NOT_MOUNTED: File isn't mounted.
- * @G_IO_ERROR_ALREADY_MOUNTED: File is already mounted.
- * @G_IO_ERROR_CLOSED: File was closed.
- * @G_IO_ERROR_CANCELLED: Operation was cancelled. See #GCancellable.
- * @G_IO_ERROR_PENDING: Operations are still pending.
- * @G_IO_ERROR_READ_ONLY: File is read only.
- * @G_IO_ERROR_CANT_CREATE_BACKUP: Backup couldn't be created.
- * @G_IO_ERROR_WRONG_ETAG: File's Entity Tag was incorrect.
- * @G_IO_ERROR_TIMED_OUT: Operation timed out.
- * @G_IO_ERROR_WOULD_RECURSE: Operation would be recursive.
- * @G_IO_ERROR_BUSY: File is busy.
- * @G_IO_ERROR_WOULD_BLOCK: Operation would block.
- * @G_IO_ERROR_HOST_NOT_FOUND: Host couldn't be found (remote operations).
- * @G_IO_ERROR_WOULD_MERGE: Operation would merge files.
- * @G_IO_ERROR_FAILED_HANDLED: Operation failed and a helper program has already interacted with the user. Do not display any error dialog.
- *
- * Error codes returned by GIO functions.
- *
- **/
-typedef enum
-{
- G_IO_ERROR_FAILED,
- G_IO_ERROR_NOT_FOUND,
- G_IO_ERROR_EXISTS,
- G_IO_ERROR_IS_DIRECTORY,
- G_IO_ERROR_NOT_DIRECTORY,
- G_IO_ERROR_NOT_EMPTY,
- G_IO_ERROR_NOT_REGULAR_FILE,
- G_IO_ERROR_NOT_SYMBOLIC_LINK,
- G_IO_ERROR_NOT_MOUNTABLE_FILE,
- G_IO_ERROR_FILENAME_TOO_LONG,
- G_IO_ERROR_INVALID_FILENAME,
- G_IO_ERROR_TOO_MANY_LINKS,
- G_IO_ERROR_NO_SPACE,
- G_IO_ERROR_INVALID_ARGUMENT,
- G_IO_ERROR_PERMISSION_DENIED,
- G_IO_ERROR_NOT_SUPPORTED,
- G_IO_ERROR_NOT_MOUNTED,
- G_IO_ERROR_ALREADY_MOUNTED,
- G_IO_ERROR_CLOSED,
- G_IO_ERROR_CANCELLED,
- G_IO_ERROR_PENDING,
- G_IO_ERROR_READ_ONLY,
- G_IO_ERROR_CANT_CREATE_BACKUP,
- G_IO_ERROR_WRONG_ETAG,
- G_IO_ERROR_TIMED_OUT,
- G_IO_ERROR_WOULD_RECURSE,
- G_IO_ERROR_BUSY,
- G_IO_ERROR_WOULD_BLOCK,
- G_IO_ERROR_HOST_NOT_FOUND,
- G_IO_ERROR_WOULD_MERGE,
- G_IO_ERROR_FAILED_HANDLED
-} GIOErrorEnum;
-
GIOErrorEnum g_io_error_from_errno (gint err_no);
G_END_DECLS
Modified: trunk/gio/giomodule.h
==============================================================================
--- trunk/gio/giomodule.h (original)
+++ trunk/gio/giomodule.h Tue Jul 1 06:32:35 2008
@@ -27,7 +27,7 @@
#ifndef __G_IO_MODULE_H__
#define __G_IO_MODULE_H__
-#include <glib-object.h>
+#include <gio/giotypes.h>
#include <gmodule.h>
G_BEGIN_DECLS
@@ -44,12 +44,8 @@
*
* Opaque module base class for extending GIO.
**/
-typedef struct _GIOModule GIOModule;
typedef struct _GIOModuleClass GIOModuleClass;
-typedef struct _GIOExtensionPoint GIOExtensionPoint;
-typedef struct _GIOExtension GIOExtension;
-
GType g_io_module_get_type (void) G_GNUC_CONST;
GIOModule *g_io_module_new (const gchar *filename);
Modified: trunk/gio/gioscheduler.c
==============================================================================
--- trunk/gio/gioscheduler.c (original)
+++ trunk/gio/gioscheduler.c Tue Jul 1 06:32:35 2008
@@ -23,6 +23,7 @@
#include "config.h"
#include "gioscheduler.h"
+#include "gcancellable.h"
#include "gioalias.h"
Modified: trunk/gio/gioscheduler.h
==============================================================================
--- trunk/gio/gioscheduler.h (original)
+++ trunk/gio/gioscheduler.h Tue Jul 1 06:32:35 2008
@@ -28,38 +28,10 @@
#define __G_IO_SCHEDULER_H__
#include <glib.h>
-#include <gio/gcancellable.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
-/**
- * GIOSchedulerJob:
- *
- * Opaque class for definining and scheduling IO jobs.
- **/
-typedef struct _GIOSchedulerJob GIOSchedulerJob;
-
-/**
- * GIOSchedulerJobFunc:
- * @job: a #GIOSchedulerJob.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- * @user_data: the data to pass to callback function
- *
- * I/O Job function.
- *
- * Note that depending on whether threads are available, the
- * #GIOScheduler may run jobs in separate threads or in an idle
- * in the mainloop.
- *
- * Long-running jobs should periodically check the @cancellable
- * to see if they have been cancelled.
- *
- * Returns: %TRUE if this function should be called again to
- * complete the job, %FALSE if the job is complete (or cancelled)
- **/
-typedef gboolean (*GIOSchedulerJobFunc) (GIOSchedulerJob *job,
- GCancellable *cancellable,
- gpointer user_data);
void g_io_scheduler_push_job (GIOSchedulerJobFunc job_func,
gpointer user_data,
Added: trunk/gio/giotypes.h
==============================================================================
--- (empty file)
+++ trunk/gio/giotypes.h Tue Jul 1 06:32:35 2008
@@ -0,0 +1,197 @@
+/* GIO - GLib Input, Output and Streaming Library
+ *
+ * Copyright (C) 2006-2007 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: Alexander Larsson <alexl redhat com>
+ */
+
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
+#ifndef __GIO_TYPES_H__
+#define __GIO_TYPES_H__
+
+#include <glib-object.h>
+#include <gio/gioenums.h>
+
+G_BEGIN_DECLS
+
+typedef struct _GAppLaunchContext GAppLaunchContext;
+typedef struct _GAppInfo GAppInfo; /* Dummy typedef */
+typedef struct _GAsyncResult GAsyncResult; /* Dummy typedef */
+typedef struct _GBufferedInputStream GBufferedInputStream;
+typedef struct _GBufferedOutputStream GBufferedOutputStream;
+typedef struct _GCancellable GCancellable;
+typedef struct _GDataInputStream GDataInputStream;
+
+/**
+ * GDrive:
+ *
+ * Opaque drive object.
+ **/
+typedef struct _GDrive GDrive; /* Dummy typedef */
+typedef struct _GFileEnumerator GFileEnumerator;
+typedef struct _GFileMonitor GFileMonitor;
+typedef struct _GFilterInputStream GFilterInputStream;
+typedef struct _GFilterOutputStream GFilterOutputStream;
+
+/**
+ * GFile:
+ *
+ * A handle to an object implementing the #GFileIface interface.
+ * Generally stores a location within the file system. Handles do not
+ * necessarily represent files or directories that currently exist.
+ **/
+typedef struct _GFile GFile; /* Dummy typedef */
+typedef struct _GFileInfo GFileInfo;
+
+/**
+ * GFileAttributeMatcher:
+ *
+ * Determines if a string matches a file attribute.
+ **/
+typedef struct _GFileAttributeMatcher GFileAttributeMatcher;
+typedef struct _GFileAttributeInfo GFileAttributeInfo;
+typedef struct _GFileAttributeInfoList GFileAttributeInfoList;
+typedef struct _GFileInputStream GFileInputStream;
+typedef struct _GFileOutputStream GFileOutputStream;
+typedef struct _GFileIcon GFileIcon;
+typedef struct _GFilenameCompleter GFilenameCompleter;
+
+
+typedef struct _GIcon GIcon; /* Dummy typedef */
+typedef struct _GInputStream GInputStream;
+typedef struct _GIOModule GIOModule;
+typedef struct _GIOExtensionPoint GIOExtensionPoint;
+typedef struct _GIOExtension GIOExtension;
+
+/**
+ * GIOSchedulerJob:
+ *
+ * Opaque class for definining and scheduling IO jobs.
+ **/
+typedef struct _GIOSchedulerJob GIOSchedulerJob;
+typedef struct _GLoadableIcon GLoadableIcon; /* Dummy typedef */
+typedef struct _GMemoryInputStream GMemoryInputStream;
+typedef struct _GMemoryOutputStream GMemoryOutputStream;
+
+/**
+ * GMount:
+ *
+ * A handle to an object implementing the #GMountIface interface.
+ **/
+typedef struct _GMount GMount; /* Dummy typedef */
+typedef struct _GMountOperation GMountOperation;
+typedef struct _GOutputStream GOutputStream;
+typedef struct _GSeekable GSeekable;
+typedef struct _GSimpleAsyncResult GSimpleAsyncResult;
+typedef struct _GThemedIcon GThemedIcon;
+typedef struct _GVfs GVfs; /* Dummy typedef */
+
+/**
+ * GVolume:
+ *
+ * Opaque mountable volume object.
+ **/
+typedef struct _GVolume GVolume; /* Dummy typedef */
+typedef struct _GVolumeMonitor GVolumeMonitor;
+
+/**
+ * GAsyncReadyCallback:
+ * @source_object: the object the asynchronous operation was started with.
+ * @res: a #GAsyncResult.
+ * @user_data: user data passed to the callback.
+ *
+ * Type definition for a function that will be called back when an asynchronous
+ * operation within GIO has been completed.
+ **/
+typedef void (*GAsyncReadyCallback) (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data);
+
+/**
+ * GFileProgressCallback:
+ * @current_num_bytes: the current number of bytes in the operation.
+ * @total_num_bytes: the total number of bytes in the operation.
+ * @user_data: user data passed to the callback.
+ *
+ * When doing file operations that may take a while, such as moving
+ * a file or copying a file, a progress callback is used to pass how
+ * far along that operation is to the application.
+ **/
+typedef void (*GFileProgressCallback) (goffset current_num_bytes,
+ goffset total_num_bytes,
+ gpointer user_data);
+
+/**
+ * GFileReadMoreCallback:
+ * @file_contents: the data as currently read.
+ * @file_size: the size of the data currently read.
+ * @callback_data: data passed to the callback.
+ *
+ * When loading the partial contents of a file with g_file_read_partial_contents(),
+ * it may become necessary to determine if any more data from the file should be loaded.
+ * A #GFileReadMoreCallback function facilitates this by returning %TRUE if more data
+ * should be read, or %FALSE otherwise.
+ *
+ * Returns: %TRUE if more data should be read back. %FALSE otherwise.
+ **/
+typedef gboolean (* GFileReadMoreCallback) (const char *file_contents,
+ goffset file_size,
+ gpointer callback_data);
+
+
+/**
+ * GIOSchedulerJobFunc:
+ * @job: a #GIOSchedulerJob.
+ * @cancellable: optional #GCancellable object, %NULL to ignore.
+ * @user_data: the data to pass to callback function
+ *
+ * I/O Job function.
+ *
+ * Note that depending on whether threads are available, the
+ * #GIOScheduler may run jobs in separate threads or in an idle
+ * in the mainloop.
+ *
+ * Long-running jobs should periodically check the @cancellable
+ * to see if they have been cancelled.
+ *
+ * Returns: %TRUE if this function should be called again to
+ * complete the job, %FALSE if the job is complete (or cancelled)
+ **/
+typedef gboolean (*GIOSchedulerJobFunc) (GIOSchedulerJob *job,
+ GCancellable *cancellable,
+ gpointer user_data);
+
+/**
+ * GSimpleAsyncThreadFunc:
+ * @res: a #GSimpleAsyncResult.
+ * @object: a #GObject.
+ * @cancellable: optional #GCancellable object, %NULL to ignore.
+ *
+ * Simple thread function that runs an asynchronous operation and
+ * checks for cancellation.
+ **/
+typedef void (*GSimpleAsyncThreadFunc) (GSimpleAsyncResult *res,
+ GObject *object,
+ GCancellable *cancellable);
+
+G_END_DECLS
+
+#endif /* __GIO_TYPES_H__ */
Modified: trunk/gio/gloadableicon.c
==============================================================================
--- trunk/gio/gloadableicon.c (original)
+++ trunk/gio/gloadableicon.c Tue Jul 1 06:32:35 2008
@@ -21,7 +21,9 @@
*/
#include "config.h"
+#include "gasyncresult.h"
#include "gsimpleasyncresult.h"
+#include "gicon.h"
#include "gloadableicon.h"
#include "glibintl.h"
Modified: trunk/gio/gloadableicon.h
==============================================================================
--- trunk/gio/gloadableicon.h (original)
+++ trunk/gio/gloadableicon.h Tue Jul 1 06:32:35 2008
@@ -27,9 +27,7 @@
#ifndef __G_LOADABLE_ICON_H__
#define __G_LOADABLE_ICON_H__
-#include <glib-object.h>
-#include <gio/gicon.h>
-#include <gio/ginputstream.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -44,7 +42,6 @@
* Generic type for all kinds of icons that can be loaded
* as a stream.
**/
-typedef struct _GLoadableIcon GLoadableIcon; /* Dummy typedef */
typedef struct _GLoadableIconIface GLoadableIconIface;
/**
Modified: trunk/gio/glocaldirectorymonitor.c
==============================================================================
--- trunk/gio/glocaldirectorymonitor.c (original)
+++ trunk/gio/glocaldirectorymonitor.c Tue Jul 1 06:32:35 2008
@@ -25,6 +25,8 @@
#include "glocaldirectorymonitor.h"
#include "gunixmounts.h"
#include "giomodule-priv.h"
+#include "gfile.h"
+#include "gioerror.h"
#include "glibintl.h"
#include <string.h>
Modified: trunk/gio/glocaldirectorymonitor.h
==============================================================================
--- trunk/gio/glocaldirectorymonitor.h (original)
+++ trunk/gio/glocaldirectorymonitor.h Tue Jul 1 06:32:35 2008
@@ -23,7 +23,6 @@
#ifndef __G_LOCAL_DIRECTORY_MONITOR_H__
#define __G_LOCAL_DIRECTORY_MONITOR_H__
-#include <glib-object.h>
#include <gio/gfilemonitor.h>
#include "gunixmounts.h"
Modified: trunk/gio/glocalfile.c
==============================================================================
--- trunk/gio/glocalfile.c (original)
+++ trunk/gio/glocalfile.c Tue Jul 1 06:32:35 2008
@@ -72,6 +72,7 @@
#endif
+#include "gfileattribute.h"
#include "glocalfile.h"
#include "glocalfileinfo.h"
#include "glocalfileenumerator.h"
@@ -80,6 +81,8 @@
#include "glocaldirectorymonitor.h"
#include "glocalfilemonitor.h"
#include "gmountprivate.h"
+#include "gunixmounts.h"
+#include "gioerror.h"
#include <glib/gstdio.h>
#include "glibintl.h"
Modified: trunk/gio/glocalfile.h
==============================================================================
--- trunk/gio/glocalfile.h (original)
+++ trunk/gio/glocalfile.h Tue Jul 1 06:32:35 2008
@@ -23,7 +23,7 @@
#ifndef __G_LOCAL_FILE_H__
#define __G_LOCAL_FILE_H__
-#include <gio/gfile.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
Modified: trunk/gio/glocalfileenumerator.c
==============================================================================
--- trunk/gio/glocalfileenumerator.c (original)
+++ trunk/gio/glocalfileenumerator.c Tue Jul 1 06:32:35 2008
@@ -26,6 +26,7 @@
#include <glocalfileenumerator.h>
#include <glocalfileinfo.h>
#include <glocalfile.h>
+#include <gioerror.h>
#include <string.h>
#include <stdlib.h>
#include "glibintl.h"
Modified: trunk/gio/glocalfileenumerator.h
==============================================================================
--- trunk/gio/glocalfileenumerator.h (original)
+++ trunk/gio/glocalfileenumerator.h Tue Jul 1 06:32:35 2008
@@ -24,8 +24,6 @@
#define __G_LOCAL_FILE_ENUMERATOR_H__
#include <gfileenumerator.h>
-#include <gfileinfo.h>
-#include <gfile.h>
#include <glocalfile.h>
G_BEGIN_DECLS
Modified: trunk/gio/glocalfileinputstream.c
==============================================================================
--- trunk/gio/glocalfileinputstream.c (original)
+++ trunk/gio/glocalfileinputstream.c Tue Jul 1 06:32:35 2008
@@ -32,6 +32,7 @@
#include <glib.h>
#include <glib/gstdio.h>
+#include "gcancellable.h"
#include "gioerror.h"
#include "glocalfileinputstream.h"
#include "glocalfileinfo.h"
Modified: trunk/gio/glocalfilemonitor.c
==============================================================================
--- trunk/gio/glocalfilemonitor.c (original)
+++ trunk/gio/glocalfilemonitor.c Tue Jul 1 06:32:35 2008
@@ -24,6 +24,7 @@
#include "glocalfilemonitor.h"
#include "giomodule-priv.h"
+#include "gioerror.h"
#include "glibintl.h"
#include <string.h>
Modified: trunk/gio/glocalfilemonitor.h
==============================================================================
--- trunk/gio/glocalfilemonitor.h (original)
+++ trunk/gio/glocalfilemonitor.h Tue Jul 1 06:32:35 2008
@@ -23,7 +23,6 @@
#ifndef __G_LOCAL_FILE_MONITOR_H__
#define __G_LOCAL_FILE_MONITOR_H__
-#include <glib-object.h>
#include <gio/gfilemonitor.h>
G_BEGIN_DECLS
Modified: trunk/gio/glocalfileoutputstream.c
==============================================================================
--- trunk/gio/glocalfileoutputstream.c (original)
+++ trunk/gio/glocalfileoutputstream.c Tue Jul 1 06:32:35 2008
@@ -35,6 +35,7 @@
#include <glib/gstdio.h>
#include "glibintl.h"
#include "gioerror.h"
+#include "gcancellable.h"
#include "glocalfileoutputstream.h"
#include "glocalfileinfo.h"
Modified: trunk/gio/glocalfileoutputstream.h
==============================================================================
--- trunk/gio/glocalfileoutputstream.h (original)
+++ trunk/gio/glocalfileoutputstream.h Tue Jul 1 06:32:35 2008
@@ -24,7 +24,6 @@
#define __G_LOCAL_FILE_OUTPUT_STREAM_H__
#include <gio/gfileoutputstream.h>
-#include <gio/gfile.h>
G_BEGIN_DECLS
Modified: trunk/gio/glocalvfs.c
==============================================================================
--- trunk/gio/glocalvfs.c (original)
+++ trunk/gio/glocalvfs.c Tue Jul 1 06:32:35 2008
@@ -24,6 +24,7 @@
#include "glocalvfs.h"
#include "glocalfile.h"
#include "giomodule.h"
+#include "gvfs.h"
#include <gio/gdummyfile.h>
#include <sys/types.h>
#ifdef HAVE_PWD_H
Modified: trunk/gio/glocalvfs.h
==============================================================================
--- trunk/gio/glocalvfs.h (original)
+++ trunk/gio/glocalvfs.h Tue Jul 1 06:32:35 2008
@@ -23,7 +23,7 @@
#ifndef __G_LOCAL_VFS_H__
#define __G_LOCAL_VFS_H__
-#include <gio/gvfs.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
Modified: trunk/gio/gmemoryinputstream.c
==============================================================================
--- trunk/gio/gmemoryinputstream.c (original)
+++ trunk/gio/gmemoryinputstream.c Tue Jul 1 06:32:35 2008
@@ -26,6 +26,7 @@
#include "gseekable.h"
#include "string.h"
#include "gsimpleasyncresult.h"
+#include "gioerror.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gmemoryinputstream.h
==============================================================================
--- trunk/gio/gmemoryinputstream.h (original)
+++ trunk/gio/gmemoryinputstream.h Tue Jul 1 06:32:35 2008
@@ -27,7 +27,6 @@
#ifndef __G_MEMORY_INPUT_STREAM_H__
#define __G_MEMORY_INPUT_STREAM_H__
-#include <glib-object.h>
#include <gio/ginputstream.h>
G_BEGIN_DECLS
@@ -44,7 +43,6 @@
*
* Implements #GInputStream for arbitrary memory chunks.
**/
-typedef struct _GMemoryInputStream GMemoryInputStream;
typedef struct _GMemoryInputStreamClass GMemoryInputStreamClass;
typedef struct _GMemoryInputStreamPrivate GMemoryInputStreamPrivate;
Modified: trunk/gio/gmemoryoutputstream.c
==============================================================================
--- trunk/gio/gmemoryoutputstream.c (original)
+++ trunk/gio/gmemoryoutputstream.c Tue Jul 1 06:32:35 2008
@@ -25,6 +25,7 @@
#include "goutputstream.h"
#include "gseekable.h"
#include "gsimpleasyncresult.h"
+#include "gioerror.h"
#include "string.h"
#include "glibintl.h"
Modified: trunk/gio/gmemoryoutputstream.h
==============================================================================
--- trunk/gio/gmemoryoutputstream.h (original)
+++ trunk/gio/gmemoryoutputstream.h Tue Jul 1 06:32:35 2008
@@ -27,7 +27,6 @@
#ifndef __G_MEMORY_OUTPUT_STREAM_H__
#define __G_MEMORY_OUTPUT_STREAM_H__
-#include <glib-object.h>
#include <gio/goutputstream.h>
G_BEGIN_DECLS
@@ -44,7 +43,6 @@
*
* Implements #GOutputStream for arbitrary memory chunks.
**/
-typedef struct _GMemoryOutputStream GMemoryOutputStream;
typedef struct _GMemoryOutputStreamClass GMemoryOutputStreamClass;
typedef struct _GMemoryOutputStreamPrivate GMemoryOutputStreamPrivate;
Modified: trunk/gio/gmount.c
==============================================================================
--- trunk/gio/gmount.c (original)
+++ trunk/gio/gmount.c Tue Jul 1 06:32:35 2008
@@ -29,7 +29,9 @@
#include "gmount.h"
#include "gmountprivate.h"
+#include "gasyncresult.h"
#include "gsimpleasyncresult.h"
+#include "gioerror.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gmount.h
==============================================================================
--- trunk/gio/gmount.h (original)
+++ trunk/gio/gmount.h Tue Jul 1 06:32:35 2008
@@ -28,8 +28,7 @@
#ifndef __G_MOUNT_H__
#define __G_MOUNT_H__
-#include <glib-object.h>
-#include <gio/gfile.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -38,21 +37,6 @@
#define G_IS_MOUNT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_MOUNT))
#define G_MOUNT_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_MOUNT, GMountIface))
-/* GMount typedef is in gfile.h due to include order issues */
-/**
- * GVolume:
- *
- * Opaque mountable volume object.
- **/
-typedef struct _GVolume GVolume; /* Dummy typedef */
-
-/**
- * GDrive:
- *
- * Opaque drive object.
- **/
-typedef struct _GDrive GDrive; /* Dummy typedef */
-
typedef struct _GMountIface GMountIface;
/**
Modified: trunk/gio/gmountoperation.h
==============================================================================
--- trunk/gio/gmountoperation.h (original)
+++ trunk/gio/gmountoperation.h Tue Jul 1 06:32:35 2008
@@ -27,9 +27,7 @@
#ifndef __G_MOUNT_OPERATION_H__
#define __G_MOUNT_OPERATION_H__
-#include <sys/stat.h>
-
-#include <glib-object.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -46,7 +44,6 @@
* Class for providing authentication methods for mounting operations,
* such as mounting a file locally, or authenticating with a server.
**/
-typedef struct _GMountOperation GMountOperation;
typedef struct _GMountOperationClass GMountOperationClass;
typedef struct _GMountOperationPrivate GMountOperationPrivate;
@@ -57,59 +54,6 @@
GMountOperationPrivate *priv;
};
-/**
- * GAskPasswordFlags:
- * @G_ASK_PASSWORD_NEED_PASSWORD: operation requires a password.
- * @G_ASK_PASSWORD_NEED_USERNAME: operation requires a username.
- * @G_ASK_PASSWORD_NEED_DOMAIN: operation requires a domain.
- * @G_ASK_PASSWORD_SAVING_SUPPORTED: operation supports saving settings.
- * @G_ASK_PASSWORD_ANONYMOUS_SUPPORTED: operation supports anonymous users.
- *
- * #GAskPasswordFlags are used to request specific information from the
- * user, or to notify the user of their choices in an authentication
- * situation.
- *
- **/
-typedef enum {
- G_ASK_PASSWORD_NEED_PASSWORD = 1<<0,
- G_ASK_PASSWORD_NEED_USERNAME = 1<<1,
- G_ASK_PASSWORD_NEED_DOMAIN = 1<<2,
- G_ASK_PASSWORD_SAVING_SUPPORTED = 1<<3,
- G_ASK_PASSWORD_ANONYMOUS_SUPPORTED = 1<<4
-} GAskPasswordFlags;
-
-/**
- * GPasswordSave:
- * @G_PASSWORD_SAVE_NEVER: never save a password.
- * @G_PASSWORD_SAVE_FOR_SESSION: save a password for the session.
- * @G_PASSWORD_SAVE_PERMANENTLY: save a password permanently.
- *
- * #GPasswordSave is used to indicate the lifespan of a saved password.
- *
- * #Gvfs stores passwords in the Gnome keyring when this flag allows it
- * to, and later retrieves it again from there.
- **/
-typedef enum {
- G_PASSWORD_SAVE_NEVER,
- G_PASSWORD_SAVE_FOR_SESSION,
- G_PASSWORD_SAVE_PERMANENTLY
-} GPasswordSave;
-
-/**
- * GMountOperationResult:
- * @G_MOUNT_OPERATION_HANDLED: The request was fulfilled and the user specified data is now availible
- * @G_MOUNT_OPERATION_ABORTED: The user requested the mount operation to be aborted
- * @G_MOUNT_OPERATION_UNHANDLED: The request was unhandled (i.e. not implemented)
- *
- * #GMountOperationResult is returned as a result when a request for information
- * is send by the mounting operation.
- **/
-typedef enum {
- G_MOUNT_OPERATION_HANDLED,
- G_MOUNT_OPERATION_ABORTED,
- G_MOUNT_OPERATION_UNHANDLED
-} GMountOperationResult;
-
struct _GMountOperationClass
{
GObjectClass parent_class;
Modified: trunk/gio/gnativevolumemonitor.h
==============================================================================
--- trunk/gio/gnativevolumemonitor.h (original)
+++ trunk/gio/gnativevolumemonitor.h Tue Jul 1 06:32:35 2008
@@ -1,7 +1,6 @@
#ifndef __G_NATIVE_VOLUME_MONITOR_H__
#define __G_NATIVE_VOLUME_MONITOR_H__
-#include <glib-object.h>
#include <gio/gvolumemonitor.h>
G_BEGIN_DECLS
@@ -14,7 +13,7 @@
#define G_NATIVE_VOLUME_MONITOR_EXTENSION_POINT_NAME "gio-native-volume-monitor"
-typedef struct _GNativeVolumeMonitor GNativeVolumeMonitor;
+typedef struct _GNativeVolumeMonitor GNativeVolumeMonitor;
typedef struct _GNativeVolumeMonitorClass GNativeVolumeMonitorClass;
struct _GNativeVolumeMonitor {
Modified: trunk/gio/goutputstream.c
==============================================================================
--- trunk/gio/goutputstream.c (original)
+++ trunk/gio/goutputstream.c Tue Jul 1 06:32:35 2008
@@ -22,7 +22,11 @@
#include "config.h"
#include "goutputstream.h"
+#include "gcancellable.h"
+#include "gasyncresult.h"
#include "gsimpleasyncresult.h"
+#include "ginputstream.h"
+#include "gioerror.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/goutputstream.h
==============================================================================
--- trunk/gio/goutputstream.h (original)
+++ trunk/gio/goutputstream.h Tue Jul 1 06:32:35 2008
@@ -27,11 +27,7 @@
#ifndef __G_OUTPUT_STREAM_H__
#define __G_OUTPUT_STREAM_H__
-#include <glib-object.h>
-#include <gio/gioerror.h>
-#include <gio/gasyncresult.h>
-#include <gio/gcancellable.h>
-#include <gio/ginputstream.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -43,20 +39,6 @@
#define G_OUTPUT_STREAM_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_OUTPUT_STREAM, GOutputStreamClass))
/**
- * GOutputStreamSpliceFlags:
- * @G_OUTPUT_STREAM_SPLICE_NONE: Do not close either stream.
- * @G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE: Close the source stream after the splice.
- * @G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET: Close the target stream after the splice.
- *
- * GOutputStreamSpliceFlags determine how streams should be spliced.
- **/
-typedef enum {
- G_OUTPUT_STREAM_SPLICE_NONE = 0,
- G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE = 1 << 0,
- G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET = 1 << 1
-} GOutputStreamSpliceFlags;
-
-/**
* GOutputStream:
*
* Base class for writing output.
@@ -65,7 +47,6 @@
* writing, splicing, flushing and closing streams, but may implement
* asynchronous versions.
**/
-typedef struct _GOutputStream GOutputStream;
typedef struct _GOutputStreamClass GOutputStreamClass;
typedef struct _GOutputStreamPrivate GOutputStreamPrivate;
Modified: trunk/gio/gpollfilemonitor.c
==============================================================================
--- trunk/gio/gpollfilemonitor.c (original)
+++ trunk/gio/gpollfilemonitor.c Tue Jul 1 06:32:35 2008
@@ -24,7 +24,9 @@
#include <string.h>
#include "gpollfilemonitor.h"
+#include "gfile.h"
#include "gfilemonitor.h"
+#include "gfileinfo.h"
#include "gioalias.h"
Modified: trunk/gio/gpollfilemonitor.h
==============================================================================
--- trunk/gio/gpollfilemonitor.h (original)
+++ trunk/gio/gpollfilemonitor.h Tue Jul 1 06:32:35 2008
@@ -23,7 +23,6 @@
#ifndef __G_POLL_FILE_MONITOR_H__
#define __G_POLL_FILE_MONITOR_H__
-#include <glib-object.h>
#include <gio/gfilemonitor.h>
G_BEGIN_DECLS
Modified: trunk/gio/gseekable.h
==============================================================================
--- trunk/gio/gseekable.h (original)
+++ trunk/gio/gseekable.h Tue Jul 1 06:32:35 2008
@@ -27,8 +27,7 @@
#ifndef __G_SEEKABLE_H__
#define __G_SEEKABLE_H__
-#include <glib-object.h>
-#include <gio/gcancellable.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -42,7 +41,6 @@
*
* Seek object for streaming operations.
**/
-typedef struct _GSeekable GSeekable;
typedef struct _GSeekableIface GSeekableIface;
/**
Modified: trunk/gio/gsimpleasyncresult.c
==============================================================================
--- trunk/gio/gsimpleasyncresult.c (original)
+++ trunk/gio/gsimpleasyncresult.c Tue Jul 1 06:32:35 2008
@@ -32,6 +32,8 @@
#endif
#include "gsimpleasyncresult.h"
+#include "gasyncresult.h"
+#include "gcancellable.h"
#include "gioscheduler.h"
#include <gio/gioerror.h>
#include "glibintl.h"
Modified: trunk/gio/gsimpleasyncresult.h
==============================================================================
--- trunk/gio/gsimpleasyncresult.h (original)
+++ trunk/gio/gsimpleasyncresult.h Tue Jul 1 06:32:35 2008
@@ -27,8 +27,7 @@
#ifndef __G_SIMPLE_ASYNC_RESULT_H__
#define __G_SIMPLE_ASYNC_RESULT_H__
-#include <gio/gasyncresult.h>
-#include <gio/gcancellable.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -44,22 +43,8 @@
*
* A simple implementation of #GAsyncResult.
**/
-typedef struct _GSimpleAsyncResult GSimpleAsyncResult;
typedef struct _GSimpleAsyncResultClass GSimpleAsyncResultClass;
-/**
- * GSimpleAsyncThreadFunc:
- * @res: a #GSimpleAsyncResult.
- * @object: a #GObject.
- * @cancellable: optional #GCancellable object, %NULL to ignore.
- *
- * Simple thread function that runs an asynchronous operation and
- * checks for cancellation.
- **/
-typedef void (*GSimpleAsyncThreadFunc) (GSimpleAsyncResult *res,
- GObject *object,
- GCancellable *cancellable);
-
GType g_simple_async_result_get_type (void) G_GNUC_CONST;
Modified: trunk/gio/gthemedicon.c
==============================================================================
--- trunk/gio/gthemedicon.c (original)
+++ trunk/gio/gthemedicon.c Tue Jul 1 06:32:35 2008
@@ -25,6 +25,7 @@
#include <string.h>
#include "gthemedicon.h"
+#include "gicon.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gthemedicon.h
==============================================================================
--- trunk/gio/gthemedicon.h (original)
+++ trunk/gio/gthemedicon.h Tue Jul 1 06:32:35 2008
@@ -27,7 +27,7 @@
#ifndef __G_THEMED_ICON_H__
#define __G_THEMED_ICON_H__
-#include <gio/gicon.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -43,7 +43,6 @@
*
* An implementation of #GIcon for themed icons.
**/
-typedef struct _GThemedIcon GThemedIcon;
typedef struct _GThemedIconClass GThemedIconClass;
GType g_themed_icon_get_type (void) G_GNUC_CONST;
Modified: trunk/gio/gunionvolumemonitor.h
==============================================================================
--- trunk/gio/gunionvolumemonitor.h (original)
+++ trunk/gio/gunionvolumemonitor.h Tue Jul 1 06:32:35 2008
@@ -24,7 +24,6 @@
#ifndef __G_UNION_VOLUME_MONITOR_H__
#define __G_UNION_VOLUME_MONITOR_H__
-#include <glib-object.h>
#include <gio/gvolumemonitor.h>
G_BEGIN_DECLS
@@ -35,12 +34,11 @@
#define G_IS_UNION_VOLUME_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_UNION_VOLUME_MONITOR))
#define G_IS_UNION_VOLUME_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_UNION_VOLUME_MONITOR))
-typedef struct _GUnionVolumeMonitor GUnionVolumeMonitor;
+typedef struct _GUnionVolumeMonitor GUnionVolumeMonitor;
typedef struct _GUnionVolumeMonitorClass GUnionVolumeMonitorClass;
struct _GUnionVolumeMonitorClass {
GVolumeMonitorClass parent_class;
-
};
GType _g_union_volume_monitor_get_type (void) G_GNUC_CONST;
Modified: trunk/gio/gunixmount.c
==============================================================================
--- trunk/gio/gunixmount.c (original)
+++ trunk/gio/gunixmount.c Tue Jul 1 06:32:35 2008
@@ -32,11 +32,15 @@
#include <glib.h>
#include "gunixvolumemonitor.h"
#include "gunixmount.h"
+#include "gunixmounts.h"
#include "gunixvolume.h"
#include "gmountprivate.h"
+#include "gmount.h"
+#include "gfile.h"
#include "gvolumemonitor.h"
#include "gthemedicon.h"
#include "gsimpleasyncresult.h"
+#include "gioerror.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gunixmount.h
==============================================================================
--- trunk/gio/gunixmount.h (original)
+++ trunk/gio/gunixmount.h Tue Jul 1 06:32:35 2008
@@ -24,10 +24,9 @@
#ifndef __G_UNIX_MOUNT_H__
#define __G_UNIX_MOUNT_H__
-#include <glib-object.h>
-#include <gio/gmount.h>
-#include <gio/gunixmounts.h>
-#include <gio/gunixvolumemonitor.h>
+#include <gio/giotypes.h>
+
+#include "gunixmounts.h"
G_BEGIN_DECLS
Modified: trunk/gio/gunixmounts.h
==============================================================================
--- trunk/gio/gunixmounts.h (original)
+++ trunk/gio/gunixmounts.h Tue Jul 1 06:32:35 2008
@@ -48,7 +48,7 @@
*
* Watches #GUnixMount<!-- -->s for changes.
**/
-typedef struct _GUnixMountMonitor GUnixMountMonitor;
+typedef struct _GUnixMountMonitor GUnixMountMonitor;
typedef struct _GUnixMountMonitorClass GUnixMountMonitorClass;
#define G_TYPE_UNIX_MOUNT_MONITOR (g_unix_mount_monitor_get_type ())
Modified: trunk/gio/gunixvolume.c
==============================================================================
--- trunk/gio/gunixvolume.c (original)
+++ trunk/gio/gunixvolume.c Tue Jul 1 06:32:35 2008
@@ -32,9 +32,12 @@
#include <glib.h>
#include "gunixvolume.h"
#include "gunixmount.h"
+#include "gunixmounts.h"
#include "gthemedicon.h"
+#include "gvolume.h"
#include "gvolumemonitor.h"
#include "gsimpleasyncresult.h"
+#include "gioerror.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gunixvolume.h
==============================================================================
--- trunk/gio/gunixvolume.h (original)
+++ trunk/gio/gunixvolume.h Tue Jul 1 06:32:35 2008
@@ -24,10 +24,9 @@
#ifndef __G_UNIX_VOLUME_H__
#define __G_UNIX_VOLUME_H__
-#include <glib-object.h>
-#include <gio/gvolume.h>
-#include <gio/gunixmounts.h>
+#include <gio/giotypes.h>
#include <gio/gunixvolumemonitor.h>
+#include <gio/gunixmounts.h>
G_BEGIN_DECLS
Modified: trunk/gio/gunixvolumemonitor.c
==============================================================================
--- trunk/gio/gunixvolumemonitor.c (original)
+++ trunk/gio/gunixvolumemonitor.c Tue Jul 1 06:32:35 2008
@@ -32,7 +32,9 @@
#include "gunixmounts.h"
#include "gunixmount.h"
#include "gunixvolume.h"
+#include "gmount.h"
#include "gmountprivate.h"
+#include "giomodule.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gunixvolumemonitor.h
==============================================================================
--- trunk/gio/gunixvolumemonitor.h (original)
+++ trunk/gio/gunixvolumemonitor.h Tue Jul 1 06:32:35 2008
@@ -24,7 +24,6 @@
#ifndef __G_UNIX_VOLUME_MONITOR_H__
#define __G_UNIX_VOLUME_MONITOR_H__
-#include <glib-object.h>
#include <gio/gnativevolumemonitor.h>
G_BEGIN_DECLS
@@ -35,7 +34,7 @@
#define G_IS_UNIX_VOLUME_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_UNIX_VOLUME_MONITOR))
#define G_IS_UNIX_VOLUME_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_UNIX_VOLUME_MONITOR))
-typedef struct _GUnixVolumeMonitor GUnixVolumeMonitor;
+typedef struct _GUnixVolumeMonitor GUnixVolumeMonitor;
typedef struct _GUnixVolumeMonitorClass GUnixVolumeMonitorClass;
/* Forward definitions */
Modified: trunk/gio/gvfs.h
==============================================================================
--- trunk/gio/gvfs.h (original)
+++ trunk/gio/gvfs.h Tue Jul 1 06:32:35 2008
@@ -27,8 +27,7 @@
#ifndef __G_VFS_H__
#define __G_VFS_H__
-#include <glib-object.h>
-#include <gio/gfile.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -52,7 +51,6 @@
*
* Virtual File System object.
**/
-typedef struct _GVfs GVfs; /* Dummy typedef */
typedef struct _GVfsClass GVfsClass;
struct _GVfs {
Modified: trunk/gio/gvolume.c
==============================================================================
--- trunk/gio/gvolume.c (original)
+++ trunk/gio/gvolume.c Tue Jul 1 06:32:35 2008
@@ -24,7 +24,9 @@
#include "config.h"
#include "gmount.h"
#include "gvolume.h"
+#include "gasyncresult.h"
#include "gsimpleasyncresult.h"
+#include "gioerror.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gvolume.h
==============================================================================
--- trunk/gio/gvolume.h (original)
+++ trunk/gio/gvolume.h Tue Jul 1 06:32:35 2008
@@ -28,9 +28,7 @@
#ifndef __G_VOLUME_H__
#define __G_VOLUME_H__
-#include <glib-object.h>
-#include <gio/gfile.h>
-#include <gio/gdrive.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
Modified: trunk/gio/gvolumemonitor.c
==============================================================================
--- trunk/gio/gvolumemonitor.c (original)
+++ trunk/gio/gvolumemonitor.c Tue Jul 1 06:32:35 2008
@@ -25,6 +25,9 @@
#include "config.h"
#include "gvolumemonitor.h"
+#include "gvolume.h"
+#include "gmount.h"
+#include "gdrive.h"
#include "glibintl.h"
#include "gioalias.h"
Modified: trunk/gio/gvolumemonitor.h
==============================================================================
--- trunk/gio/gvolumemonitor.h (original)
+++ trunk/gio/gvolumemonitor.h Tue Jul 1 06:32:35 2008
@@ -30,10 +30,7 @@
#ifndef __G_VOLUME_MONITOR_H__
#define __G_VOLUME_MONITOR_H__
-#include <glib-object.h>
-#include <gio/gmount.h>
-#include <gio/gvolume.h>
-#include <gio/gdrive.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -58,7 +55,6 @@
*
* A Volume Monitor that watches for volume events.
**/
-typedef struct _GVolumeMonitor GVolumeMonitor;
typedef struct _GVolumeMonitorClass GVolumeMonitorClass;
struct _GVolumeMonitor {
Modified: trunk/gio/gwin32appinfo.h
==============================================================================
--- trunk/gio/gwin32appinfo.h (original)
+++ trunk/gio/gwin32appinfo.h Tue Jul 1 06:32:35 2008
@@ -23,7 +23,7 @@
#ifndef __G_WIN32_APP_INFO_H__
#define __G_WIN32_APP_INFO_H__
-#include <gio/gappinfo.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
Modified: trunk/gio/gwin32mount.h
==============================================================================
--- trunk/gio/gwin32mount.h (original)
+++ trunk/gio/gwin32mount.h Tue Jul 1 06:32:35 2008
@@ -26,9 +26,7 @@
#ifndef __G_WIN32_MOUNT_H__
#define __G_WIN32_MOUNT_H__
-#include <glib-object.h>
-#include <gio/gmount.h>
-#include <gio/gwin32volumemonitor.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
Modified: trunk/gio/gwin32volumemonitor.h
==============================================================================
--- trunk/gio/gwin32volumemonitor.h (original)
+++ trunk/gio/gwin32volumemonitor.h Tue Jul 1 06:32:35 2008
@@ -26,7 +26,6 @@
#ifndef __G_WIN32_VOLUME_MONITOR_H__
#define __G_WIN32_VOLUME_MONITOR_H__
-#include <glib-object.h>
#include <gio/gnativevolumemonitor.h>
G_BEGIN_DECLS
@@ -63,70 +62,4 @@
G_END_DECLS
-#endif /* __G_WIN32_VOLUME_MONITOR_H__ */
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright (C) 2006-2007 Red Hat, Inc.
- * Copyright (C) 2008 Hans Breuer
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Alexander Larsson <alexl redhat com>
- * David Zeuthen <davidz redhat com>
- * Hans Breuer <hans breuer org>
- */
-
-#ifndef __G_WIN32_VOLUME_MONITOR_H__
-#define __G_WIN32_VOLUME_MONITOR_H__
-
-#include <glib-object.h>
-#include <gio/gnativevolumemonitor.h>
-
-G_BEGIN_DECLS
-
-#define G_TYPE_WIN32_VOLUME_MONITOR (_g_win32_volume_monitor_get_type ())
-#define G_WIN32_VOLUME_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_WIN32_VOLUME_MONITOR, GWin32VolumeMonitor))
-#define G_WIN32_VOLUME_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_WIN32_VOLUME_MONITOR, GWin32VolumeMonitorClass))
-#define G_IS_WIN32_VOLUME_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_WIN32_VOLUME_MONITOR))
-#define G_IS_WIN32_VOLUME_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_WIN32_VOLUME_MONITOR))
-
-typedef struct _GWin32VolumeMonitor GWin32VolumeMonitor;
-typedef struct _GWin32VolumeMonitorClass GWin32VolumeMonitorClass;
-
-/* Forward definitions */
-
-/**
- * GWin32Mount:
- *
- * Implementation of the #GMount interface for Win32 systems.
- */
-typedef struct _GWin32Mount GWin32Mount;
-typedef struct _GWin32Volume GWin32Volume;
-
-struct _GWin32VolumeMonitorClass {
- GNativeVolumeMonitorClass parent_class;
-
-};
-
-GType _g_win32_volume_monitor_get_type (void) G_GNUC_CONST;
-
-GVolumeMonitor * _g_win32_volume_monitor_new (void);
-GWin32Volume * _g_win32_volume_monitor_lookup_volume_for_mount_path (GWin32VolumeMonitor *monitor,
- const char *mount_path);
-
-G_END_DECLS
-
-#endif /* __G_WIN32_VOLUME_MONITOR_H__ */
+#endif
Modified: trunk/gio/inotify/inotify-helper.c
==============================================================================
--- trunk/gio/inotify/inotify-helper.c (original)
+++ trunk/gio/inotify/inotify-helper.c Tue Jul 1 06:32:35 2008
@@ -32,6 +32,7 @@
#include <sys/inotify.h>
#include <gio/glocalfile.h>
#include <gio/gfilemonitor.h>
+#include <gio/gfile.h>
#include "inotify-helper.h"
#include "inotify-missing.h"
#include "inotify-path.h"
Modified: trunk/gio/tests/live-g-file.c
==============================================================================
--- trunk/gio/tests/live-g-file.c (original)
+++ trunk/gio/tests/live-g-file.c Tue Jul 1 06:32:35 2008
@@ -24,7 +24,7 @@
#include <gio/gio.h>
#include <stdlib.h>
#include <string.h>
-
+#include <sys/stat.h>
#define DEFAULT_TEST_DIR "testdir_live-g-file"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
