glib r7433 - trunk/gio
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: glib r7433 - trunk/gio
- Date: Tue, 2 Sep 2008 19:05:58 +0000 (UTC)
Author: mitch
Date: Tue Sep 2 19:05:58 2008
New Revision: 7433
URL: http://svn.gnome.org/viewvc/glib?rev=7433&view=rev
Log:
2008-09-02 Michael Natterer <mitch imendio com>
* *.h: big header formatting cleanup: indentation, vtable
formatting, consistent spacing in (* vfunc), trailing whitespace
removal. Formatting should be pretty consistent in all GIO headers
now.
Modified:
trunk/gio/ChangeLog
trunk/gio/gappinfo.h
trunk/gio/gasynchelper.h
trunk/gio/gasyncresult.h
trunk/gio/gbufferedinputstream.h
trunk/gio/gcancellable.h
trunk/gio/gcontenttype.h
trunk/gio/gdatainputstream.h
trunk/gio/gdataoutputstream.h
trunk/gio/gdesktopappinfo.h
trunk/gio/gdrive.h
trunk/gio/gdummyfile.h
trunk/gio/gemblem.c
trunk/gio/gemblem.h
trunk/gio/gemblemedicon.h
trunk/gio/gfile.h
trunk/gio/gfileattribute.h
trunk/gio/gfileenumerator.h
trunk/gio/gfileicon.h
trunk/gio/gfileinfo.h
trunk/gio/gfileinputstream.h
trunk/gio/gfilemonitor.h
trunk/gio/gfilenamecompleter.h
trunk/gio/gfileoutputstream.h
trunk/gio/gfilterinputstream.h
trunk/gio/gfilteroutputstream.h
trunk/gio/gicon.h
trunk/gio/ginputstream.h
trunk/gio/gio.h
trunk/gio/gioenums.h
trunk/gio/gioerror.h
trunk/gio/giomodule.h
trunk/gio/gioscheduler.h
trunk/gio/giotypes.h
trunk/gio/gloadableicon.h
trunk/gio/glocaldirectorymonitor.h
trunk/gio/glocalfile.h
trunk/gio/glocalfileenumerator.h
trunk/gio/glocalfileinfo.h
trunk/gio/glocalfileinputstream.h
trunk/gio/glocalfilemonitor.h
trunk/gio/glocalfileoutputstream.h
trunk/gio/glocalvfs.h
trunk/gio/gmemoryinputstream.h
trunk/gio/gmemoryoutputstream.h
trunk/gio/gmount.h
trunk/gio/gmountoperation.h
trunk/gio/gnativevolumemonitor.h
trunk/gio/goutputstream.h
trunk/gio/gpollfilemonitor.h
trunk/gio/gseekable.h
trunk/gio/gsimpleasyncresult.h
trunk/gio/gthemedicon.h
trunk/gio/gunionvolumemonitor.h
trunk/gio/gunixinputstream.h
trunk/gio/gunixmount.h
trunk/gio/gunixmounts.h
trunk/gio/gunixoutputstream.h
trunk/gio/gunixvolume.h
trunk/gio/gunixvolumemonitor.h
trunk/gio/gvfs.h
trunk/gio/gvolume.h
trunk/gio/gvolumemonitor.h
trunk/gio/gwin32appinfo.h
trunk/gio/gwin32mount.h
trunk/gio/gwin32volumemonitor.h
Modified: trunk/gio/gappinfo.h
==============================================================================
--- trunk/gio/gappinfo.h (original)
+++ trunk/gio/gappinfo.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -48,7 +48,7 @@
/**
* GAppInfo:
- *
+ *
* Information about an installed application and methods to launch
* it (with file arguments).
*/
@@ -75,7 +75,7 @@
* @add_supports_type: Adds to the #GAppInfo information about supported file types.
* @can_remove_supports_type: Checks for support for removing supported file types from a #GAppInfo.
* @remove_supports_type: Removes a supported application type from a #GAppInfo.
- *
+ *
* Application Information interface, for operating system portability.
*/
typedef struct _GAppInfoIface GAppInfoIface;
@@ -86,45 +86,43 @@
/* Virtual Table */
- GAppInfo * (*dup) (GAppInfo *appinfo);
- gboolean (*equal) (GAppInfo *appinfo1,
- GAppInfo *appinfo2);
- const char * (*get_id) (GAppInfo *appinfo);
- const char * (*get_name) (GAppInfo *appinfo);
- const char * (*get_description) (GAppInfo *appinfo);
- const char * (*get_executable) (GAppInfo *appinfo);
- GIcon * (*get_icon) (GAppInfo *appinfo);
- gboolean (*launch) (GAppInfo *appinfo,
- GList *filenames,
- GAppLaunchContext *launch_context,
- GError **error);
- gboolean (*supports_uris) (GAppInfo *appinfo);
- gboolean (*supports_files) (GAppInfo *appinfo);
- gboolean (*launch_uris) (GAppInfo *appinfo,
- GList *uris,
- GAppLaunchContext *launch_context,
- GError **error);
- gboolean (*should_show) (GAppInfo *appinfo);
+ GAppInfo * (* dup) (GAppInfo *appinfo);
+ gboolean (* equal) (GAppInfo *appinfo1,
+ GAppInfo *appinfo2);
+ const char * (* get_id) (GAppInfo *appinfo);
+ const char * (* get_name) (GAppInfo *appinfo);
+ const char * (* get_description) (GAppInfo *appinfo);
+ const char * (* get_executable) (GAppInfo *appinfo);
+ GIcon * (* get_icon) (GAppInfo *appinfo);
+ gboolean (* launch) (GAppInfo *appinfo,
+ GList *filenames,
+ GAppLaunchContext *launch_context,
+ GError **error);
+ gboolean (* supports_uris) (GAppInfo *appinfo);
+ gboolean (* supports_files) (GAppInfo *appinfo);
+ gboolean (* launch_uris) (GAppInfo *appinfo,
+ GList *uris,
+ GAppLaunchContext *launch_context,
+ GError **error);
+ gboolean (* should_show) (GAppInfo *appinfo);
/* For changing associations */
- gboolean (*set_as_default_for_type) (GAppInfo *appinfo,
- const char *content_type,
- GError **error);
- gboolean (*set_as_default_for_extension) (GAppInfo *appinfo,
- const char *extension,
- GError **error);
- gboolean (*add_supports_type) (GAppInfo *appinfo,
- const char *content_type,
- GError **error);
- gboolean (*can_remove_supports_type) (GAppInfo *appinfo);
- gboolean (*remove_supports_type) (GAppInfo *appinfo,
- const char *content_type,
- GError **error);
+ gboolean (* set_as_default_for_type) (GAppInfo *appinfo,
+ const char *content_type,
+ GError **error);
+ gboolean (* set_as_default_for_extension) (GAppInfo *appinfo,
+ const char *extension,
+ GError **error);
+ gboolean (* add_supports_type) (GAppInfo *appinfo,
+ const char *content_type,
+ GError **error);
+ gboolean (* can_remove_supports_type) (GAppInfo *appinfo);
+ gboolean (* remove_supports_type) (GAppInfo *appinfo,
+ const char *content_type,
+ GError **error);
};
-GType g_app_info_get_type (void) G_GNUC_CONST;
-GType g_app_launch_context_get_type (void) G_GNUC_CONST;
-
+GType g_app_info_get_type (void) G_GNUC_CONST;
GAppInfo * g_app_info_create_from_commandline (const char *commandline,
const char *application_name,
GAppInfoCreateFlags flags,
@@ -176,7 +174,7 @@
/**
* GAppLaunchContext:
* @parent_instance: The parent instance.
- *
+ *
* Integrating the launch with the launching application. This is used to
* handle for instance startup notification and launching the new application
* on the same screen as the launching window.
@@ -193,14 +191,14 @@
{
GObjectClass parent_class;
- char * (*get_display) (GAppLaunchContext *context,
- GAppInfo *info,
- GList *files);
- char * (*get_startup_notify_id) (GAppLaunchContext *context,
- GAppInfo *info,
- GList *files);
- void (*launch_failed) (GAppLaunchContext *context,
- const char *startup_notify_id);
+ char * (* get_display) (GAppLaunchContext *context,
+ GAppInfo *info,
+ GList *files);
+ char * (* get_startup_notify_id) (GAppLaunchContext *context,
+ GAppInfo *info,
+ GList *files);
+ void (* launch_failed) (GAppLaunchContext *context,
+ const char *startup_notify_id);
/* Padding for future expansion */
void (*_g_reserved1) (void);
@@ -210,6 +208,7 @@
void (*_g_reserved5) (void);
};
+GType g_app_launch_context_get_type (void) G_GNUC_CONST;
GAppLaunchContext *g_app_launch_context_new (void);
char * g_app_launch_context_get_display (GAppLaunchContext *context,
GAppInfo *info,
Modified: trunk/gio/gasynchelper.h
==============================================================================
--- trunk/gio/gasynchelper.h (original)
+++ trunk/gio/gasynchelper.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -27,15 +27,16 @@
G_BEGIN_DECLS
-typedef struct {
+typedef struct
+{
gpointer async_object;
GError * error;
gpointer user_data;
} GAsyncResultData;
-typedef gboolean (*GFDSourceFunc) (gpointer user_data,
+typedef gboolean (*GFDSourceFunc) (gpointer user_data,
GIOCondition condition,
- int fd);
+ int fd);
void _g_queue_async_result (GAsyncResultData *result,
gpointer async_object,
Modified: trunk/gio/gasyncresult.h
==============================================================================
--- trunk/gio/gasyncresult.h (original)
+++ trunk/gio/gasyncresult.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -39,7 +39,7 @@
/**
* GAsyncResult:
*
- * Holds results information for an asynchronous operation,
+ * Holds results information for an asynchronous operation,
* usually passed directly to a asynchronous _finish() operation.
**/
typedef struct _GAsyncResultIface GAsyncResultIface;
@@ -47,7 +47,7 @@
/**
* GAsyncResultIface:
- * @g_iface: The parent interface.
+ * @g_iface: The parent interface.
* @get_user_data: Gets the user data passed to the callback.
* @get_source_object: Gets the source object that issued the asynchronous operation.
*
@@ -59,11 +59,11 @@
/* Virtual Table */
- gpointer (*get_user_data) (GAsyncResult *async_result);
- GObject * (*get_source_object) (GAsyncResult *async_result);
+ gpointer (* get_user_data) (GAsyncResult *async_result);
+ GObject * (* get_source_object) (GAsyncResult *async_result);
};
-GType g_async_result_get_type (void) G_GNUC_CONST;
+GType g_async_result_get_type (void) G_GNUC_CONST;
gpointer g_async_result_get_user_data (GAsyncResult *res);
GObject *g_async_result_get_source_object (GAsyncResult *res);
Modified: trunk/gio/gbufferedinputstream.h
==============================================================================
--- trunk/gio/gbufferedinputstream.h (original)
+++ trunk/gio/gbufferedinputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*
- * Author: Christian Kellner <gicmo gnome org>
+ * Author: Christian Kellner <gicmo gnome org>
*/
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
@@ -40,7 +40,7 @@
/**
* GBufferedInputStream:
- *
+ *
* Implements #GFilterInputStream with a sized input buffer.
**/
typedef struct _GBufferedInputStreamClass GBufferedInputStreamClass;
@@ -56,7 +56,7 @@
struct _GBufferedInputStreamClass
{
- GFilterInputStreamClass parent_class;
+ GFilterInputStreamClass parent_class;
gssize (* fill) (GBufferedInputStream *stream,
gssize count,
@@ -118,7 +118,6 @@
GCancellable *cancellable,
GError **error);
-
G_END_DECLS
#endif /* __G_BUFFERED_INPUT_STREAM_H__ */
Modified: trunk/gio/gcancellable.h
==============================================================================
--- trunk/gio/gcancellable.h (original)
+++ trunk/gio/gcancellable.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -40,7 +40,7 @@
/**
* GCancellable:
- *
+ *
* Allows actions to be cancelled.
*/
typedef struct _GCancellableClass GCancellableClass;
@@ -50,7 +50,7 @@
GObjectClass parent_class;
void (* cancelled) (GCancellable *cancellable);
-
+
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
@@ -60,9 +60,9 @@
void (*_g_reserved5) (void);
};
-GType g_cancellable_get_type (void) G_GNUC_CONST;
+GType g_cancellable_get_type (void) G_GNUC_CONST;
-GCancellable *g_cancellable_new (void);
+GCancellable *g_cancellable_new (void);
/* These are only safe to call inside a cancellable op */
gboolean g_cancellable_is_cancelled (GCancellable *cancellable);
Modified: trunk/gio/gcontenttype.h
==============================================================================
--- trunk/gio/gcontenttype.h (original)
+++ trunk/gio/gcontenttype.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -27,7 +27,6 @@
#ifndef __G_CONTENT_TYPE_H__
#define __G_CONTENT_TYPE_H__
-#include <glib.h>
#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -49,7 +48,7 @@
gsize data_size,
gboolean *result_uncertain);
-char ** g_content_type_guess_for_tree (GFile *root);
+char ** g_content_type_guess_for_tree (GFile *root);
GList * g_content_types_get_registered (void);
Modified: trunk/gio/gdatainputstream.h
==============================================================================
--- trunk/gio/gdatainputstream.h (original)
+++ trunk/gio/gdatainputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -42,7 +42,7 @@
* GDataInputStream:
* @parent: a #GBufferedInputStream.
*
- * An implementation of #GBufferedInputStream that allows for high-level
+ * An implementation of #GBufferedInputStream that allows for high-level
* data manipulation of arbitrary data (including binary operations).
**/
typedef struct _GDataInputStreamClass GDataInputStreamClass;
@@ -58,7 +58,8 @@
struct _GDataInputStreamClass
{
- GBufferedInputStreamClass parent_class;
+ GBufferedInputStreamClass parent_class;
+
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
@@ -68,8 +69,8 @@
void (*_g_reserved5) (void);
};
-GType g_data_input_stream_get_type (void) G_GNUC_CONST;
-GDataInputStream* g_data_input_stream_new (GInputStream *base_stream);
+GType g_data_input_stream_get_type (void) G_GNUC_CONST;
+GDataInputStream * g_data_input_stream_new (GInputStream *base_stream);
void g_data_input_stream_set_byte_order (GDataInputStream *stream,
GDataStreamByteOrder order);
Modified: trunk/gio/gdataoutputstream.h
==============================================================================
--- trunk/gio/gdataoutputstream.h (original)
+++ trunk/gio/gdataoutputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -42,7 +42,7 @@
* GDataOutputStream:
* @parent_instance: a #GBufferedOutputStream.
*
- * An implementation of #GBufferedOutputStream that allows for high-level
+ * An implementation of #GBufferedOutputStream that allows for high-level
* data manipulation of arbitrary data (including binary operations).
**/
typedef struct _GDataOutputStream GDataOutputStream;
@@ -59,7 +59,8 @@
struct _GDataOutputStreamClass
{
- GFilterOutputStreamClass parent_class;
+ GFilterOutputStreamClass parent_class;
+
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
@@ -70,8 +71,8 @@
};
-GType g_data_output_stream_get_type (void) G_GNUC_CONST;
-GDataOutputStream* g_data_output_stream_new (GOutputStream *base_stream);
+GType g_data_output_stream_get_type (void) G_GNUC_CONST;
+GDataOutputStream * g_data_output_stream_new (GOutputStream *base_stream);
void g_data_output_stream_set_byte_order (GDataOutputStream *stream,
GDataStreamByteOrder order);
Modified: trunk/gio/gdesktopappinfo.h
==============================================================================
--- trunk/gio/gdesktopappinfo.h (original)
+++ trunk/gio/gdesktopappinfo.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -43,15 +43,15 @@
};
-GType g_desktop_app_info_get_type (void) G_GNUC_CONST;
-
+GType g_desktop_app_info_get_type (void) G_GNUC_CONST;
+
GDesktopAppInfo *g_desktop_app_info_new_from_filename (const char *filename);
GDesktopAppInfo *g_desktop_app_info_new_from_keyfile (GKeyFile *key_file);
GDesktopAppInfo *g_desktop_app_info_new (const char *desktop_id);
gboolean g_desktop_app_info_get_is_hidden (GDesktopAppInfo *info);
-void g_desktop_app_info_set_desktop_env (const char *desktop_env);
+void g_desktop_app_info_set_desktop_env (const char *desktop_env);
#define G_TYPE_DESKTOP_APP_INFO_LOOKUP (g_desktop_app_info_lookup_get_type ())
@@ -70,7 +70,7 @@
/**
* GDesktopAppInfoLookup:
*
- * Interface that is used by backends to associate default
+ * Interface that is used by backends to associate default
* handlers with URI schemes.
*/
typedef struct _GDesktopAppInfoLookup GDesktopAppInfoLookup;
@@ -80,15 +80,15 @@
{
GTypeInterface g_iface;
- GAppInfo * (*get_default_for_uri_scheme) (GDesktopAppInfoLookup *lookup,
- const char *uri_scheme);
+ GAppInfo * (* get_default_for_uri_scheme) (GDesktopAppInfoLookup *lookup,
+ const char *uri_scheme);
};
-GType g_desktop_app_info_lookup_get_type (void) G_GNUC_CONST;
+GType g_desktop_app_info_lookup_get_type (void) G_GNUC_CONST;
+
GAppInfo *g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup,
- const char *uri_scheme);
+ const char *uri_scheme);
G_END_DECLS
-
#endif /* __G_DESKTOP_APP_INFO_H__ */
Modified: trunk/gio/gdrive.h
==============================================================================
--- trunk/gio/gdrive.h (original)
+++ trunk/gio/gdrive.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -56,14 +56,13 @@
* @eject_finish: Finishes an eject operation.
* @poll_for_media: Poll for media insertion/removal on a #GDrive.
* @poll_for_media_finish: Finishes a media poll operation.
- * @get_identifier: Returns the identifier of the given kind, or %NULL if
+ * @get_identifier: Returns the identifier of the given kind, or %NULL if
* the #GDrive doesn't have one.
* @enumerate_identifiers: Returns an array strings listing the kinds
* of identifiers which the #GDrive has.
*
- *
* Interface for creating #GDrive implementations.
- */
+ */
typedef struct _GDriveIface GDriveIface;
struct _GDriveIface
@@ -71,42 +70,42 @@
GTypeInterface g_iface;
/* signals */
- void (*changed) (GDrive *drive);
- void (*disconnected) (GDrive *drive);
- void (*eject_button) (GDrive *drive);
-
+ void (* changed) (GDrive *drive);
+ void (* disconnected) (GDrive *drive);
+ void (* eject_button) (GDrive *drive);
+
/* Virtual Table */
- char * (*get_name) (GDrive *drive);
- GIcon * (*get_icon) (GDrive *drive);
- gboolean (*has_volumes) (GDrive *drive);
- GList * (*get_volumes) (GDrive *drive);
- gboolean (*is_media_removable) (GDrive *drive);
- gboolean (*has_media) (GDrive *drive);
- gboolean (*is_media_check_automatic) (GDrive *drive);
- gboolean (*can_eject) (GDrive *drive);
- gboolean (*can_poll_for_media) (GDrive *drive);
- void (*eject) (GDrive *drive,
- GMountUnmountFlags flags,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*eject_finish) (GDrive *drive,
- GAsyncResult *result,
- GError **error);
- void (*poll_for_media) (GDrive *drive,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*poll_for_media_finish) (GDrive *drive,
- GAsyncResult *result,
- GError **error);
-
- char * (*get_identifier) (GDrive *drive,
- const char *kind);
- char ** (*enumerate_identifiers) (GDrive *drive);
+ char * (* get_name) (GDrive *drive);
+ GIcon * (* get_icon) (GDrive *drive);
+ gboolean (* has_volumes) (GDrive *drive);
+ GList * (* get_volumes) (GDrive *drive);
+ gboolean (* is_media_removable) (GDrive *drive);
+ gboolean (* has_media) (GDrive *drive);
+ gboolean (* is_media_check_automatic) (GDrive *drive);
+ gboolean (* can_eject) (GDrive *drive);
+ gboolean (* can_poll_for_media) (GDrive *drive);
+ void (* eject) (GDrive *drive,
+ GMountUnmountFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* eject_finish) (GDrive *drive,
+ GAsyncResult *result,
+ GError **error);
+ void (* poll_for_media) (GDrive *drive,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* poll_for_media_finish) (GDrive *drive,
+ GAsyncResult *result,
+ GError **error);
+
+ char * (* get_identifier) (GDrive *drive,
+ const char *kind);
+ char ** (* enumerate_identifiers) (GDrive *drive);
};
-GType g_drive_get_type (void) G_GNUC_CONST;
+GType g_drive_get_type (void) G_GNUC_CONST;
char * g_drive_get_name (GDrive *drive);
GIcon * g_drive_get_icon (GDrive *drive);
Modified: trunk/gio/gdummyfile.h
==============================================================================
--- trunk/gio/gdummyfile.h (original)
+++ trunk/gio/gdummyfile.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -42,9 +42,9 @@
GObjectClass parent_class;
};
-GType _g_dummy_file_get_type (void) G_GNUC_CONST;
-
-GFile * _g_dummy_file_new (const char *uri);
+GType _g_dummy_file_get_type (void) G_GNUC_CONST;
+
+GFile * _g_dummy_file_new (const char *uri);
G_END_DECLS
Modified: trunk/gio/gemblem.c
==============================================================================
--- trunk/gio/gemblem.c (original)
+++ trunk/gio/gemblem.c Tue Sep 2 19:05:58 2008
@@ -19,9 +19,9 @@
*
*/
-
#include <config.h>
+#include "gicon.h"
#include "gemblem.h"
#include "glibintl.h"
#include "gioenums.h"
Modified: trunk/gio/gemblem.h
==============================================================================
--- trunk/gio/gemblem.h (original)
+++ trunk/gio/gemblem.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* GIO - GLib Input, Output and Streaming Library
- *
+ *
* Copyright (C) 2008 Clemens N. Buss <cebuzz gmail com>
*
* This library is free software; you can redistribute it and/or
@@ -18,7 +18,7 @@
* Boston, MA 02111-1307, USA.
*
*/
-
+
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
#error "Only <gio/gio.h> can be included directly."
#endif
@@ -26,10 +26,8 @@
#ifndef __G_EMBLEM_H__
#define __G_EMBLEM_H__
-#include <gio/gicon.h>
#include <gio/gioenums.h>
-
G_BEGIN_DECLS
#define G_TYPE_EMBLEM (g_emblem_get_type ())
@@ -41,14 +39,14 @@
/**
* GEmblem:
- *
+ *
* An object for Emblems
*/
typedef struct _GEmblem GEmblem;
typedef struct _GEmblemClass GEmblemClass;
GType g_emblem_get_type (void) G_GNUC_CONST;
-
+
GEmblem *g_emblem_new (GIcon *icon);
GEmblem *g_emblem_new_with_origin (GIcon *icon,
GEmblemOrigin origin);
Modified: trunk/gio/gemblemedicon.h
==============================================================================
--- trunk/gio/gemblemedicon.h (original)
+++ trunk/gio/gemblemedicon.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -29,8 +29,7 @@
#define __G_EMBLEMED_ICON_H__
#include <gio/gicon.h>
-
-#include "gemblem.h"
+#include <gio/gemblem.h>
G_BEGIN_DECLS
@@ -43,22 +42,21 @@
/**
* GEmblemedIcon:
- *
+ *
* An implementation of #GIcon for icons with emblems.
**/
typedef struct _GEmblemedIcon GEmblemedIcon;
typedef struct _GEmblemedIconClass GEmblemedIconClass;
GType g_emblemed_icon_get_type (void) G_GNUC_CONST;
-
-GIcon *g_emblemed_icon_new (GIcon *icon,
+
+GIcon *g_emblemed_icon_new (GIcon *icon,
GEmblem *emblem);
GIcon *g_emblemed_icon_get_icon (GEmblemedIcon *emblemed);
GList *g_emblemed_icon_get_emblems (GEmblemedIcon *emblemed);
-void g_emblemed_icon_add_emblem (GEmblemedIcon *emblemed,
+void g_emblemed_icon_add_emblem (GEmblemedIcon *emblemed,
GEmblem *emblem);
-
G_END_DECLS
#endif /* __G_EMBLEMED_ICON_H__ */
Modified: trunk/gio/gfile.h
==============================================================================
--- trunk/gio/gfile.h (original)
+++ trunk/gio/gfile.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -39,9 +39,9 @@
#if 0
/**
* GFile:
- *
- * A handle to an object implementing the #GFileIface interface.
- * Generally stores a location within the file system. Handles do not
+ *
+ * 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 */
@@ -59,7 +59,7 @@
* @has_uri_scheme: Checks to see if a #GFile has a given URI scheme.
* @get_uri_scheme: Gets the URI scheme for a #GFile.
* @get_basename: Gets the basename for a given #GFile.
- * @get_path: Gets the current path within a #GFile.
+ * @get_path: Gets the current path within a #GFile.
* @get_uri: Gets a URI for the path within a #GFile.
* @get_parse_name: Gets the parsed name for the #GFile.
* @get_parent: Gets the parent directory for the #GFile.
@@ -120,7 +120,7 @@
* @copy_async: Asynchronously copies a file.
* @copy_finish: Finishes an asynchronous copy operation.
* @move: Moves a file.
- * @_move_async: Asynchronously moves a file.
+ * @_move_async: Asynchronously moves a file.
* @_move_finish: Finishes an asynchronous move operation.
* @mount_mountable: Mounts a mountable object.
* @mount_mountable_finish: Finishes a mounting operation.
@@ -128,315 +128,312 @@
* @unmount_mountable_finish: Finishes an unmount operation.
* @eject_mountable: Ejects a mountable.
* @eject_mountable_finish: Finishes an eject operation.
- * @mount_enclosing_volume: Mounts a specified location.
+ * @mount_enclosing_volume: Mounts a specified location.
* @mount_enclosing_volume_finish: Finishes mounting a specified location.
* @monitor_dir: Creates a #GFileMonitor for the location.
* @monitor_file: Creates a #GFileMonitor for the location.
- *
- * An interface for writing VFS file handles.
- **/
+ *
+ * An interface for writing VFS file handles.
+ **/
struct _GFileIface
{
GTypeInterface g_iface;
/* Virtual Table */
- GFile * (*dup) (GFile *file);
- guint (*hash) (GFile *file);
- gboolean (*equal) (GFile *file1,
- GFile *file2);
- gboolean (*is_native) (GFile *file);
- gboolean (*has_uri_scheme) (GFile *file,
- const char *uri_scheme);
- char * (*get_uri_scheme) (GFile *file);
- char * (*get_basename) (GFile *file);
- char * (*get_path) (GFile *file);
- char * (*get_uri) (GFile *file);
- char * (*get_parse_name) (GFile *file);
- GFile * (*get_parent) (GFile *file);
- gboolean (*prefix_matches) (GFile *prefix,
- GFile *file);
- char * (*get_relative_path) (GFile *parent,
- GFile *descendant);
- GFile * (*resolve_relative_path) (GFile *file,
- const char *relative_path);
- GFile * (*get_child_for_display_name) (GFile *file,
- const char *display_name,
- GError **error);
-
- GFileEnumerator * (*enumerate_children) (GFile *file,
- const char *attributes,
- GFileQueryInfoFlags flags,
- GCancellable *cancellable,
- GError **error);
- void (*enumerate_children_async) (GFile *file,
- const char *attributes,
- GFileQueryInfoFlags flags,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GFileEnumerator * (*enumerate_children_finish) (GFile *file,
- GAsyncResult *res,
- GError **error);
-
- GFileInfo * (*query_info) (GFile *file,
- const char *attributes,
- GFileQueryInfoFlags flags,
- GCancellable *cancellable,
- GError **error);
- void (*query_info_async) (GFile *file,
- const char *attributes,
- GFileQueryInfoFlags flags,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GFileInfo * (*query_info_finish) (GFile *file,
- GAsyncResult *res,
- GError **error);
-
- GFileInfo * (*query_filesystem_info)(GFile *file,
- const char *attributes,
- GCancellable *cancellable,
- GError **error);
- void (*query_filesystem_info_async) (GFile *file,
- const char *attributes,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GFileInfo * (*query_filesystem_info_finish) (GFile *file,
+ GFile * (* dup) (GFile *file);
+ guint (* hash) (GFile *file);
+ gboolean (* equal) (GFile *file1,
+ GFile *file2);
+ gboolean (* is_native) (GFile *file);
+ gboolean (* has_uri_scheme) (GFile *file,
+ const char *uri_scheme);
+ char * (* get_uri_scheme) (GFile *file);
+ char * (* get_basename) (GFile *file);
+ char * (* get_path) (GFile *file);
+ char * (* get_uri) (GFile *file);
+ char * (* get_parse_name) (GFile *file);
+ GFile * (* get_parent) (GFile *file);
+ gboolean (* prefix_matches) (GFile *prefix,
+ GFile *file);
+ char * (* get_relative_path) (GFile *parent,
+ GFile *descendant);
+ GFile * (* resolve_relative_path) (GFile *file,
+ const char *relative_path);
+ GFile * (* get_child_for_display_name) (GFile *file,
+ const char *display_name,
+ GError **error);
+
+ GFileEnumerator * (* enumerate_children) (GFile *file,
+ const char *attributes,
+ GFileQueryInfoFlags flags,
+ GCancellable *cancellable,
+ GError **error);
+ void (* enumerate_children_async) (GFile *file,
+ const char *attributes,
+ GFileQueryInfoFlags flags,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GFileEnumerator * (* enumerate_children_finish) (GFile *file,
+ GAsyncResult *res,
+ GError **error);
+
+ GFileInfo * (* query_info) (GFile *file,
+ const char *attributes,
+ GFileQueryInfoFlags flags,
+ GCancellable *cancellable,
+ GError **error);
+ void (* query_info_async) (GFile *file,
+ const char *attributes,
+ GFileQueryInfoFlags flags,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GFileInfo * (* query_info_finish) (GFile *file,
+ GAsyncResult *res,
+ GError **error);
+
+ GFileInfo * (* query_filesystem_info) (GFile *file,
+ const char *attributes,
+ GCancellable *cancellable,
+ GError **error);
+ void (* query_filesystem_info_async) (GFile *file,
+ const char *attributes,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GFileInfo * (* query_filesystem_info_finish)(GFile *file,
+ GAsyncResult *res,
+ GError **error);
+
+ GMount * (* find_enclosing_mount) (GFile *file,
+ GCancellable *cancellable,
+ GError **error);
+ void (* find_enclosing_mount_async) (GFile *file,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GMount * (* find_enclosing_mount_finish) (GFile *file,
+ GAsyncResult *res,
+ GError **error);
+
+ GFile * (* set_display_name) (GFile *file,
+ const char *display_name,
+ GCancellable *cancellable,
+ GError **error);
+ void (* set_display_name_async) (GFile *file,
+ const char *display_name,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GFile * (* set_display_name_finish) (GFile *file,
+ GAsyncResult *res,
+ GError **error);
+
+ GFileAttributeInfoList * (* query_settable_attributes) (GFile *file,
+ GCancellable *cancellable,
+ GError **error);
+ void (* _query_settable_attributes_async) (void);
+ void (* _query_settable_attributes_finish) (void);
+
+ GFileAttributeInfoList * (* query_writable_namespaces) (GFile *file,
+ GCancellable *cancellable,
+ GError **error);
+ void (* _query_writable_namespaces_async) (void);
+ void (* _query_writable_namespaces_finish) (void);
+
+ gboolean (* set_attribute) (GFile *file,
+ const char *attribute,
+ GFileAttributeType type,
+ gpointer value_p,
+ GFileQueryInfoFlags flags,
+ GCancellable *cancellable,
+ GError **error);
+ gboolean (* set_attributes_from_info) (GFile *file,
+ GFileInfo *info,
+ GFileQueryInfoFlags flags,
+ GCancellable *cancellable,
+ GError **error);
+ void (* set_attributes_async) (GFile *file,
+ GFileInfo *info,
+ GFileQueryInfoFlags flags,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* set_attributes_finish) (GFile *file,
+ GAsyncResult *result,
+ GFileInfo **info,
+ GError **error);
+
+ GFileInputStream * (* read_fn) (GFile *file,
+ GCancellable *cancellable,
+ GError **error);
+ void (* read_async) (GFile *file,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GFileInputStream * (* read_finish) (GFile *file,
+ GAsyncResult *res,
+ GError **error);
+
+ GFileOutputStream * (* append_to) (GFile *file,
+ GFileCreateFlags flags,
+ GCancellable *cancellable,
+ GError **error);
+ void (* append_to_async) (GFile *file,
+ GFileCreateFlags flags,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GFileOutputStream * (* append_to_finish) (GFile *file,
GAsyncResult *res,
GError **error);
-
- GMount * (*find_enclosing_mount)(GFile *file,
- GCancellable *cancellable,
- GError **error);
- void (*find_enclosing_mount_async)(GFile *file,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GMount * (*find_enclosing_mount_finish)(GFile *file,
- GAsyncResult *res,
- GError **error);
-
- GFile * (*set_display_name) (GFile *file,
- const char *display_name,
- GCancellable *cancellable,
- GError **error);
- void (*set_display_name_async) (GFile *file,
- const char *display_name,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GFile * (*set_display_name_finish) (GFile *file,
- GAsyncResult *res,
- GError **error);
-
- GFileAttributeInfoList * (*query_settable_attributes) (GFile *file,
- GCancellable *cancellable,
- GError **error);
- void (*_query_settable_attributes_async) (void);
- void (*_query_settable_attributes_finish) (void);
-
- GFileAttributeInfoList * (*query_writable_namespaces) (GFile *file,
- GCancellable *cancellable,
- GError **error);
- void (*_query_writable_namespaces_async) (void);
- void (*_query_writable_namespaces_finish) (void);
-
- gboolean (*set_attribute) (GFile *file,
- const char *attribute,
- GFileAttributeType type,
- gpointer value_p,
- GFileQueryInfoFlags flags,
- GCancellable *cancellable,
- GError **error);
- gboolean (*set_attributes_from_info) (GFile *file,
- GFileInfo *info,
- GFileQueryInfoFlags flags,
- GCancellable *cancellable,
- GError **error);
- void (*set_attributes_async) (GFile *file,
- GFileInfo *info,
- GFileQueryInfoFlags flags,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*set_attributes_finish) (GFile *file,
- GAsyncResult *result,
- GFileInfo **info,
- GError **error);
-
- GFileInputStream * (*read_fn) (GFile *file,
- GCancellable *cancellable,
- GError **error);
- void (*read_async) (GFile *file,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GFileInputStream * (*read_finish) (GFile *file,
- GAsyncResult *res,
- GError **error);
-
- GFileOutputStream * (*append_to) (GFile *file,
- GFileCreateFlags flags,
- GCancellable *cancellable,
- GError **error);
- void (*append_to_async) (GFile *file,
- GFileCreateFlags flags,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GFileOutputStream * (*append_to_finish) (GFile *file,
- GAsyncResult *res,
- GError **error);
-
- GFileOutputStream * (*create) (GFile *file,
- GFileCreateFlags flags,
- GCancellable *cancellable,
- GError **error);
- void (*create_async) (GFile *file,
- GFileCreateFlags flags,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GFileOutputStream * (*create_finish) (GFile *file,
- GAsyncResult *res,
- GError **error);
-
- GFileOutputStream * (*replace) (GFile *file,
- const char *etag,
- gboolean make_backup,
- GFileCreateFlags flags,
- GCancellable *cancellable,
- GError **error);
- void (*replace_async) (GFile *file,
- const char *etag,
- gboolean make_backup,
- GFileCreateFlags flags,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GFileOutputStream * (*replace_finish) (GFile *file,
- GAsyncResult *res,
- GError **error);
-
- gboolean (*delete_file) (GFile *file,
- GCancellable *cancellable,
- GError **error);
- void (*_delete_file_async) (void);
- void (*_delete_file_finish) (void);
-
- gboolean (*trash) (GFile *file,
- GCancellable *cancellable,
- GError **error);
- void (*_trash_async) (void);
- void (*_trash_finish) (void);
-
- gboolean (*make_directory) (GFile *file,
- GCancellable *cancellable,
- GError **error);
- void (*_make_directory_async) (void);
- void (*_make_directory_finish) (void);
-
- gboolean (*make_symbolic_link) (GFile *file,
- const char *symlink_value,
- GCancellable *cancellable,
- GError **error);
- void (*_make_symbolic_link_async) (void);
- void (*_make_symbolic_link_finish) (void);
-
- gboolean (*copy) (GFile *source,
- GFile *destination,
- GFileCopyFlags flags,
- GCancellable *cancellable,
- GFileProgressCallback progress_callback,
- gpointer progress_callback_data,
- GError **error);
- void (*copy_async) (GFile *source,
- GFile *destination,
- GFileCopyFlags flags,
- int io_priority,
- GCancellable *cancellable,
- GFileProgressCallback progress_callback,
- gpointer progress_callback_data,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*copy_finish) (GFile *file,
- GAsyncResult *res,
- GError **error);
-
- gboolean (*move) (GFile *source,
- GFile *destination,
- GFileCopyFlags flags,
- GCancellable *cancellable,
- GFileProgressCallback progress_callback,
- gpointer progress_callback_data,
- GError **error);
-
- void (*_move_async) (void);
- void (*_move_finish) (void);
-
-
- void (*mount_mountable) (GFile *file,
- GMountMountFlags flags,
- GMountOperation *mount_operation,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GFile * (*mount_mountable_finish) (GFile *file,
- GAsyncResult *result,
- GError **error);
- void (*unmount_mountable) (GFile *file,
- GMountUnmountFlags flags,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*unmount_mountable_finish) (GFile *file,
- GAsyncResult *result,
- GError **error);
- void (*eject_mountable) (GFile *file,
- GMountUnmountFlags flags,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*eject_mountable_finish) (GFile *file,
- GAsyncResult *result,
- GError **error);
-
-
- void (*mount_enclosing_volume) (GFile *location,
- GMountMountFlags flags,
- GMountOperation *mount_operation,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*mount_enclosing_volume_finish) (GFile *location,
- GAsyncResult *result,
- GError **error);
-
- GFileMonitor* (*monitor_dir) (GFile *file,
- GFileMonitorFlags flags,
- GCancellable *cancellable,
- GError **error);
-
- GFileMonitor* (*monitor_file) (GFile *file,
- GFileMonitorFlags flags,
- GCancellable *cancellable,
- GError **error);
+ GFileOutputStream * (* create) (GFile *file,
+ GFileCreateFlags flags,
+ GCancellable *cancellable,
+ GError **error);
+ void (* create_async) (GFile *file,
+ GFileCreateFlags flags,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GFileOutputStream * (* create_finish) (GFile *file,
+ GAsyncResult *res,
+ GError **error);
+
+ GFileOutputStream * (* replace) (GFile *file,
+ const char *etag,
+ gboolean make_backup,
+ GFileCreateFlags flags,
+ GCancellable *cancellable,
+ GError **error);
+ void (* replace_async) (GFile *file,
+ const char *etag,
+ gboolean make_backup,
+ GFileCreateFlags flags,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GFileOutputStream * (* replace_finish) (GFile *file,
+ GAsyncResult *res,
+ GError **error);
+
+ gboolean (* delete_file) (GFile *file,
+ GCancellable *cancellable,
+ GError **error);
+ void (* _delete_file_async) (void);
+ void (* _delete_file_finish) (void);
+
+ gboolean (* trash) (GFile *file,
+ GCancellable *cancellable,
+ GError **error);
+ void (* _trash_async) (void);
+ void (* _trash_finish) (void);
+
+ gboolean (* make_directory) (GFile *file,
+ GCancellable *cancellable,
+ GError **error);
+ void (* _make_directory_async) (void);
+ void (* _make_directory_finish) (void);
+
+ gboolean (* make_symbolic_link) (GFile *file,
+ const char *symlink_value,
+ GCancellable *cancellable,
+ GError **error);
+ void (* _make_symbolic_link_async) (void);
+ void (* _make_symbolic_link_finish) (void);
+
+ gboolean (* copy) (GFile *source,
+ GFile *destination,
+ GFileCopyFlags flags,
+ GCancellable *cancellable,
+ GFileProgressCallback progress_callback,
+ gpointer progress_callback_data,
+ GError **error);
+ void (* copy_async) (GFile *source,
+ GFile *destination,
+ GFileCopyFlags flags,
+ int io_priority,
+ GCancellable *cancellable,
+ GFileProgressCallback progress_callback,
+ gpointer progress_callback_data,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* copy_finish) (GFile *file,
+ GAsyncResult *res,
+ GError **error);
+
+ gboolean (* move) (GFile *source,
+ GFile *destination,
+ GFileCopyFlags flags,
+ GCancellable *cancellable,
+ GFileProgressCallback progress_callback,
+ gpointer progress_callback_data,
+ GError **error);
+ void (* _move_async) (void);
+ void (* _move_finish) (void);
+
+ void (* mount_mountable) (GFile *file,
+ GMountMountFlags flags,
+ GMountOperation *mount_operation,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GFile * (* mount_mountable_finish) (GFile *file,
+ GAsyncResult *result,
+ GError **error);
+
+ void (* unmount_mountable) (GFile *file,
+ GMountUnmountFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* unmount_mountable_finish) (GFile *file,
+ GAsyncResult *result,
+ GError **error);
+
+ void (* eject_mountable) (GFile *file,
+ GMountUnmountFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* eject_mountable_finish) (GFile *file,
+ GAsyncResult *result,
+ GError **error);
+
+ void (* mount_enclosing_volume) (GFile *location,
+ GMountMountFlags flags,
+ GMountOperation *mount_operation,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* mount_enclosing_volume_finish) (GFile *location,
+ GAsyncResult *result,
+ GError **error);
+
+ GFileMonitor * (* monitor_dir) (GFile *file,
+ GFileMonitorFlags flags,
+ GCancellable *cancellable,
+ GError **error);
+ GFileMonitor * (* monitor_file) (GFile *file,
+ GFileMonitorFlags flags,
+ GCancellable *cancellable,
+ GError **error);
};
-GType g_file_get_type (void) G_GNUC_CONST;
+GType g_file_get_type (void) G_GNUC_CONST;
GFile * g_file_new_for_path (const char *path);
GFile * g_file_new_for_uri (const char *uri);
Modified: trunk/gio/gfileattribute.h
==============================================================================
--- trunk/gio/gfileattribute.h (original)
+++ trunk/gio/gfileattribute.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -36,26 +36,28 @@
* @name: the name of the attribute.
* @type: the #GFileAttributeType type of the attribute.
* @flags: a set of #GFileAttributeInfoFlags.
- *
- * Information about a specific attribute.
+ *
+ * Information about a specific attribute.
**/
-struct _GFileAttributeInfo {
- char *name;
- GFileAttributeType type;
- GFileAttributeInfoFlags flags;
+struct _GFileAttributeInfo
+{
+ char *name;
+ GFileAttributeType type;
+ GFileAttributeInfoFlags flags;
};
/**
* GFileAttributeInfoList:
* @infos: an array of #GFileAttributeInfo<!-- -->s.
* @n_infos: the number of values in the array.
- *
+ *
* Acts as a lightweight registry for possible valid file attributes.
* The registry stores Key-Value pair formats as #GFileAttributeInfo<!-- -->s.
**/
-struct _GFileAttributeInfoList {
+struct _GFileAttributeInfoList
+{
GFileAttributeInfo *infos;
- int n_infos;
+ int n_infos;
};
GFileAttributeInfoList * g_file_attribute_info_list_new (void);
@@ -71,5 +73,4 @@
G_END_DECLS
-
#endif /* __G_FILE_INFO_H__ */
Modified: trunk/gio/gfileenumerator.h
==============================================================================
--- trunk/gio/gfileenumerator.h (original)
+++ trunk/gio/gfileenumerator.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -31,7 +31,6 @@
G_BEGIN_DECLS
-
#define G_TYPE_FILE_ENUMERATOR (g_file_enumerator_get_type ())
#define G_FILE_ENUMERATOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_FILE_ENUMERATOR, GFileEnumerator))
#define G_FILE_ENUMERATOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_ENUMERATOR, GFileEnumeratorClass))
@@ -42,7 +41,7 @@
/**
* GFileEnumerator:
* @parent_instance: The parent class.
- *
+ *
* A per matched file iterator.
**/
typedef struct _GFileEnumeratorClass GFileEnumeratorClass;
@@ -51,7 +50,7 @@
struct _GFileEnumerator
{
GObject parent_instance;
-
+
/*< private >*/
GFileEnumeratorPrivate *priv;
};
@@ -62,30 +61,30 @@
/* Virtual Table */
- GFileInfo *(*next_file) (GFileEnumerator *enumerator,
- GCancellable *cancellable,
- GError **error);
- gboolean (*close_fn) (GFileEnumerator *enumerator,
- GCancellable *cancellable,
- GError **error);
-
- void (*next_files_async) (GFileEnumerator *enumerator,
- int num_files,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GList * (*next_files_finish) (GFileEnumerator *enumerator,
- GAsyncResult *res,
- GError **error);
- void (*close_async) (GFileEnumerator *enumerator,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*close_finish) (GFileEnumerator *enumerator,
- GAsyncResult *res,
- GError **error);
+ GFileInfo * (* next_file) (GFileEnumerator *enumerator,
+ GCancellable *cancellable,
+ GError **error);
+ gboolean (* close_fn) (GFileEnumerator *enumerator,
+ GCancellable *cancellable,
+ GError **error);
+
+ void (* next_files_async) (GFileEnumerator *enumerator,
+ int num_files,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GList * (* next_files_finish) (GFileEnumerator *enumerator,
+ GAsyncResult *res,
+ GError **error);
+ void (* close_async) (GFileEnumerator *enumerator,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* close_finish) (GFileEnumerator *enumerator,
+ GAsyncResult *res,
+ GError **error);
/*< private >*/
/* Padding for future expansion */
@@ -98,7 +97,7 @@
void (*_g_reserved7) (void);
};
-GType g_file_enumerator_get_type (void) G_GNUC_CONST;
+GType g_file_enumerator_get_type (void) G_GNUC_CONST;
GFileInfo *g_file_enumerator_next_file (GFileEnumerator *enumerator,
GCancellable *cancellable,
Modified: trunk/gio/gfileicon.h
==============================================================================
--- trunk/gio/gfileicon.h (original)
+++ trunk/gio/gfileicon.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -40,16 +40,16 @@
/**
* GFileIcon:
- *
+ *
* Gets an icon for a #GFile. Implements #GLoadableIcon.
**/
typedef struct _GFileIconClass GFileIconClass;
-GType g_file_icon_get_type (void) G_GNUC_CONST;
-
-GIcon *g_file_icon_new (GFile *file);
+GType g_file_icon_get_type (void) G_GNUC_CONST;
+
+GIcon * g_file_icon_new (GFile *file);
-GFile *g_file_icon_get_file (GFileIcon *icon);
+GFile * g_file_icon_get_file (GFileIcon *icon);
G_END_DECLS
Modified: trunk/gio/gfileinfo.h
==============================================================================
--- trunk/gio/gfileinfo.h (original)
+++ trunk/gio/gfileinfo.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -40,7 +40,7 @@
/**
* GFileInfo:
- *
+ *
* Stores information about a file system object referenced by a #GFile.
**/
typedef struct _GFileInfoClass GFileInfoClass;
@@ -49,8 +49,8 @@
/* Common Attributes: */
/**
* G_FILE_ATTRIBUTE_STANDARD_TYPE:
- *
- * A key in the "standard" namespace for storing file types.
+ *
+ * A key in the "standard" namespace for storing file types.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
* The value for this key should contain a #GFileType.
**/
@@ -58,15 +58,15 @@
/**
* G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN:
- *
- * A key in the "standard" namespace for checking if a file is hidden.
+ *
+ * A key in the "standard" namespace for checking if a file is hidden.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
#define G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN "standard::is-hidden" /* boolean */
/**
* G_FILE_ATTRIBUTE_STANDARD_IS_BACKUP:
- *
+ *
* A key in the "standard" namespace for checking if a file is a backup file.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
@@ -74,7 +74,7 @@
/**
* G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK:
- *
+ *
* A key in the "standard" namespace for checking if the file is a symlink.
* Typically the actual type is something else, if we followed the symlink
* to get the type.
@@ -84,7 +84,7 @@
/**
* G_FILE_ATTRIBUTE_STANDARD_IS_VIRTUAL:
- *
+ *
* A key in the "standard" namespace for checking if a file is virtual.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
@@ -92,7 +92,7 @@
/**
* G_FILE_ATTRIBUTE_STANDARD_NAME:
- *
+ *
* A key in the "standard" namespace for getting the name of the file.
* The name is the on-disk filename which may not be in any known encoding,
* and can thus not be generally displayed as is.
@@ -104,7 +104,7 @@
/**
* G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME:
- *
+ *
* A key in the "standard" namespace for getting the display name of the file.
* A display name is guaranteed to be in UTF8 and can thus be displayed in
* the UI.
@@ -114,48 +114,48 @@
/**
* G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME:
- *
+ *
* A key in the "standard" namespace for edit name of the file.
* An edit name is similar to the display name, but it is meant to be
* used when you want to rename the file in the UI. The display name
* might contain information you don't want in the new filename (such as
* "(invalid unicode)" if the filename was in an invalid encoding).
- *
+ *
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
#define G_FILE_ATTRIBUTE_STANDARD_EDIT_NAME "standard::edit-name" /* string */
/**
* G_FILE_ATTRIBUTE_STANDARD_COPY_NAME:
- *
+ *
* A key in the "standard" namespace for getting the copy name of the file.
* The copy name is an optional version of the name. If availible its always
* in UTF8, and corresponds directly to the original filename (only transcoded to
* UTF8). This is useful if you want to copy the file to another filesystem that
* might have a different encoding. If the filename is not a valid string in the
* encoding selected for the filesystem it is in then the copy name will not be set.
- *
+ *
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
#define G_FILE_ATTRIBUTE_STANDARD_COPY_NAME "standard::copy-name" /* string */
/**
* G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION:
- *
+ *
* A key in the "standard" namespace for getting the description of the file.
* The description is a utf8 string that describes the file, generally containing
* the filename, but can also contain furter information. Example descriptions
* could be "filename (on hostname)" for a remote file or "filename (in trash)"
* for a file in the trash. This is useful for instance as the window title
* when displaying a directory or for a bookmarks menu.
- *
+ *
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
#define G_FILE_ATTRIBUTE_STANDARD_DESCRIPTION "standard::description" /* string */
/**
* G_FILE_ATTRIBUTE_STANDARD_ICON:
- *
+ *
* A key in the "standard" namespace for getting the icon for the file.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_OBJECT.
* The value for this key should contain a #GIcon.
@@ -164,7 +164,7 @@
/**
* G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE:
- *
+ *
* A key in the "standard" namespace for getting the content type of the file.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
* The value for this key should contain a valid content type.
@@ -173,19 +173,19 @@
/**
* G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE:
- *
+ *
* A key in the "standard" namespace for getting the fast content type.
* The fast content type isn't as reliable as the regular one, as it
* only uses the filename to guess it, but it is faster to calculate than the
* regular content type.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
- *
+ *
**/
#define G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE "standard::fast-content-type" /* string */
/**
* G_FILE_ATTRIBUTE_STANDARD_SIZE:
- *
+ *
* A key in the "standard" namespace for getting the file's size (in bytes).
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
**/
@@ -193,16 +193,16 @@
/**
* G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET:
- *
+ *
* A key in the "standard" namespace for getting the symlink target, if the file
- * is a symlink. Corresponding #GFileAttributeType is
+ * is a symlink. Corresponding #GFileAttributeType is
* %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
**/
#define G_FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET "standard::symlink-target" /* byte string */
/**
* G_FILE_ATTRIBUTE_STANDARD_TARGET_URI:
- *
+ *
* A key in the "standard" namespace for getting the target URI for the file, in
* the case of %G_FILE_TYPE_SHORTCUT or %G_FILE_TYPE_MOUNTABLE files.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
@@ -211,10 +211,10 @@
/**
* G_FILE_ATTRIBUTE_STANDARD_SORT_ORDER:
- *
- * A key in the "standard" namespace for setting the sort order of a file.
+ *
+ * A key in the "standard" namespace for setting the sort order of a file.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_INT32.
- * An example use would be in file managers, which would use this key
+ * An example use would be in file managers, which would use this key
* to set the order files are displayed. Files with smaller sort order
* should be sorted first, and files without sort order as if sort order
* was zero.
@@ -225,20 +225,20 @@
/**
* G_FILE_ATTRIBUTE_ETAG_VALUE:
- *
+ *
* A key in the "etag" namespace for getting the value of the file's
- * entity tag. Corresponding #GFileAttributeType is
+ * entity tag. Corresponding #GFileAttributeType is
* %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
#define G_FILE_ATTRIBUTE_ETAG_VALUE "etag::value" /* string */
-/* File identifier, for e.g. avoiding loops when doing recursive
- * directory scanning
+/* File identifier, for e.g. avoiding loops when doing recursive
+ * directory scanning
*/
/**
* G_FILE_ATTRIBUTE_ID_FILE:
- *
+ *
* A key in the "id" namespace for getting a file identifier.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
* An example use would be during listing files, to avoid recursive
@@ -248,7 +248,7 @@
/**
* G_FILE_ATTRIBUTE_ID_FILESYSTEM:
- *
+ *
* A key in the "id" namespace for getting the file system identifier.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
* An example use would be during drag and drop to see if the source
@@ -261,8 +261,8 @@
/**
* G_FILE_ATTRIBUTE_ACCESS_CAN_READ:
- *
- * A key in the "access" namespace for getting read privileges.
+ *
+ * A key in the "access" namespace for getting read privileges.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
* This attribute will be %TRUE if the user is able to read the file.
**/
@@ -270,7 +270,7 @@
/**
* G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE:
- *
+ *
* A key in the "access" namespace for getting write privileges.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
* This attribute will be %TRUE if the user is able to write to the file.
@@ -279,7 +279,7 @@
/**
* G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE:
- *
+ *
* A key in the "access" namespace for getting execution privileges.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
* This attribute will be %TRUE if the user is able to execute the file.
@@ -288,7 +288,7 @@
/**
* G_FILE_ATTRIBUTE_ACCESS_CAN_DELETE:
- *
+ *
* A key in the "access" namespace for checking deletion privileges.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
* This attribute will be %TRUE if the user is able to delete the file.
@@ -297,22 +297,22 @@
/**
* G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH:
- *
+ *
* A key in the "access" namespace for checking trashing privileges.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
- * This attribute will be %TRUE if the user is able to move the file to
+ * This attribute will be %TRUE if the user is able to move the file to
* the trash.
**/
#define G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH "access::can-trash" /* boolean */
/**
* G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME:
- *
+ *
* A key in the "access" namespace for checking renaming privileges.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
* This attribute will be %TRUE if the user is able to rename the file.
**/
-#define G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME "access::can-rename" /* boolean */
+#define G_FILE_ATTRIBUTE_ACCESS_CAN_RENAME "access::can-rename" /* boolean */
/* TODO: Should we have special version for directories? can_enumerate, etc */
@@ -320,7 +320,7 @@
/**
* G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT:
- *
+ *
* A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) is mountable.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
@@ -328,7 +328,7 @@
/**
* G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT:
- *
+ *
* A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) is unmountable.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
@@ -336,7 +336,7 @@
/**
* G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT:
- *
+ *
* A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be ejected.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
@@ -344,7 +344,7 @@
/**
* G_FILE_ATTRIBUTE_MOUNTABLE_UNIX_DEVICE:
- *
+ *
* A key in the "mountable" namespace for getting the unix device.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
**/
@@ -352,7 +352,7 @@
/**
* G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI:
- *
+ *
* A key in the "mountable" namespace for getting the HAL UDI for the mountable
* file. Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
@@ -362,49 +362,49 @@
/**
* G_FILE_ATTRIBUTE_TIME_MODIFIED:
- *
+ *
* A key in the "time" namespace for getting the time the file was last
- * modified. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the
+ * modified. Corresponding #GFileAttributeType is
+ * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the
* file was modified.
**/
#define G_FILE_ATTRIBUTE_TIME_MODIFIED "time::modified" /* uint64 */
/**
* G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC:
- *
+ *
* A key in the "time" namespace for getting the miliseconds of the time
- * the file was last modified. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_MODIFIED. Corresponding #GFileAttributeType is
+ * the file was last modified. This should be used in conjunction with
+ * #G_FILE_ATTRIBUTE_TIME_MODIFIED. Corresponding #GFileAttributeType is
* %G_FILE_ATTRIBUTE_TYPE_UINT32.
**/
#define G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC "time::modified-usec" /* uint32 */
/**
* G_FILE_ATTRIBUTE_TIME_ACCESS:
- *
+ *
* A key in the "time" namespace for getting the time the file was last
- * accessed. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the
+ * accessed. Corresponding #GFileAttributeType is
+ * %G_FILE_ATTRIBUTE_TYPE_UINT64, and contains the UNIX time since the
* file was last accessed.
**/
#define G_FILE_ATTRIBUTE_TIME_ACCESS "time::access" /* uint64 */
/**
* G_FILE_ATTRIBUTE_TIME_ACCESS_USEC:
- *
+ *
* A key in the "time" namespace for getting the microseconds of the time
* the file was last accessed. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_ACCESS. Corresponding #GFileAttributeType is
+ * #G_FILE_ATTRIBUTE_TIME_ACCESS. Corresponding #GFileAttributeType is
* %G_FILE_ATTRIBUTE_TYPE_UINT32.
**/
#define G_FILE_ATTRIBUTE_TIME_ACCESS_USEC "time::access-usec" /* uint32 */
/**
* G_FILE_ATTRIBUTE_TIME_CHANGED:
- *
+ *
* A key in the "time" namespace for getting the time the file was last
- * changed. Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64,
+ * changed. Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64,
* and contains the UNIX time since the file was last changed.
*
* This corresponds to the traditional UNIX ctime.
@@ -413,19 +413,19 @@
/**
* G_FILE_ATTRIBUTE_TIME_CHANGED_USEC:
- *
+ *
* A key in the "time" namespace for getting the microseconds of the time
* the file was last changed. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_CHANGED. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
+ * #G_FILE_ATTRIBUTE_TIME_CHANGED. Corresponding #GFileAttributeType is
+ * %G_FILE_ATTRIBUTE_TYPE_UINT32.
**/
#define G_FILE_ATTRIBUTE_TIME_CHANGED_USEC "time::changed-usec" /* uint32 */
/**
* G_FILE_ATTRIBUTE_TIME_CREATED:
- *
+ *
* A key in the "time" namespace for getting the time the file was created.
- * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64,
+ * Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64,
* and contains the UNIX time since the file was created.
*
* This corresponds to the NTFS ctime.
@@ -434,11 +434,11 @@
/**
* G_FILE_ATTRIBUTE_TIME_CREATED_USEC:
- *
+ *
* A key in the "time" namespace for getting the microseconds of the time
* the file was created. This should be used in conjunction with
- * #G_FILE_ATTRIBUTE_TIME_CREATED. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
+ * #G_FILE_ATTRIBUTE_TIME_CREATED. Corresponding #GFileAttributeType is
+ * %G_FILE_ATTRIBUTE_TYPE_UINT32.
**/
#define G_FILE_ATTRIBUTE_TIME_CREATED_USEC "time::created-usec" /* uint32 */
@@ -446,95 +446,95 @@
/**
* G_FILE_ATTRIBUTE_UNIX_DEVICE:
- *
- * A key in the "unix" namespace for getting the device id of the device the
- * file is located on (see stat() documentation). This attribute is only
- * available for UNIX file systems. Corresponding #GFileAttributeType is
- * %G_FILE_ATTRIBUTE_TYPE_UINT32.
+ *
+ * A key in the "unix" namespace for getting the device id of the device the
+ * file is located on (see stat() documentation). This attribute is only
+ * available for UNIX file systems. Corresponding #GFileAttributeType is
+ * %G_FILE_ATTRIBUTE_TYPE_UINT32.
**/
#define G_FILE_ATTRIBUTE_UNIX_DEVICE "unix::device" /* uint32 */
/**
* G_FILE_ATTRIBUTE_UNIX_INODE:
- *
+ *
* A key in the "unix" namespace for getting the inode of the file.
- * This attribute is only available for UNIX file systems. Corresponding
+ * This attribute is only available for UNIX file systems. Corresponding
* #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
**/
#define G_FILE_ATTRIBUTE_UNIX_INODE "unix::inode" /* uint64 */
/**
* G_FILE_ATTRIBUTE_UNIX_MODE:
- *
+ *
* A key in the "unix" namespace for getting the mode of the file
- * (e.g. whether the file is a regular file, symlink, etc). See lstat()
- * documentation. This attribute is only available for UNIX file systems.
+ * (e.g. whether the file is a regular file, symlink, etc). See lstat()
+ * documentation. This attribute is only available for UNIX file systems.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
**/
#define G_FILE_ATTRIBUTE_UNIX_MODE "unix::mode" /* uint32 */
/**
* G_FILE_ATTRIBUTE_UNIX_NLINK:
- *
- * A key in the "unix" namespace for getting the number of hard links
- * for a file. See lstat() documentation. This attribute is only available
- * for UNIX file systems. Corresponding #GFileAttributeType is
+ *
+ * A key in the "unix" namespace for getting the number of hard links
+ * for a file. See lstat() documentation. This attribute is only available
+ * for UNIX file systems. Corresponding #GFileAttributeType is
* %G_FILE_ATTRIBUTE_TYPE_UINT32.
**/
#define G_FILE_ATTRIBUTE_UNIX_NLINK "unix::nlink" /* uint32 */
/**
* G_FILE_ATTRIBUTE_UNIX_UID:
- *
- * A key in the "unix" namespace for getting the user ID for the file.
- * This attribute is only available for UNIX file systems.
+ *
+ * A key in the "unix" namespace for getting the user ID for the file.
+ * This attribute is only available for UNIX file systems.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
**/
#define G_FILE_ATTRIBUTE_UNIX_UID "unix::uid" /* uint32 */
/**
* G_FILE_ATTRIBUTE_UNIX_GID:
- *
+ *
* A key in the "unix" namespace for getting the group ID for the file.
- * This attribute is only available for UNIX file systems.
+ * This attribute is only available for UNIX file systems.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
**/
#define G_FILE_ATTRIBUTE_UNIX_GID "unix::gid" /* uint32 */
/**
* G_FILE_ATTRIBUTE_UNIX_RDEV:
- *
- * A key in the "unix" namespace for getting the device ID for the file
- * (if it is a special file). See lstat() documentation. This attribute
- * is only available for UNIX file systems. Corresponding #GFileAttributeType
+ *
+ * A key in the "unix" namespace for getting the device ID for the file
+ * (if it is a special file). See lstat() documentation. This attribute
+ * is only available for UNIX file systems. Corresponding #GFileAttributeType
* is %G_FILE_ATTRIBUTE_TYPE_UINT32.
**/
#define G_FILE_ATTRIBUTE_UNIX_RDEV "unix::rdev" /* uint32 */
/**
* G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE:
- *
- * A key in the "unix" namespace for getting the block size for the file
- * system. This attribute is only available for UNIX file systems.
+ *
+ * A key in the "unix" namespace for getting the block size for the file
+ * system. This attribute is only available for UNIX file systems.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
**/
#define G_FILE_ATTRIBUTE_UNIX_BLOCK_SIZE "unix::block-size" /* uint32 */
/**
* G_FILE_ATTRIBUTE_UNIX_BLOCKS:
- *
- * A key in the "unix" namespace for getting the number of blocks allocated
- * for the file. This attribute is only available for UNIX file systems.
+ *
+ * A key in the "unix" namespace for getting the number of blocks allocated
+ * for the file. This attribute is only available for UNIX file systems.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
**/
#define G_FILE_ATTRIBUTE_UNIX_BLOCKS "unix::blocks" /* uint64 */
/**
* G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT:
- *
- * A key in the "unix" namespace for checking if the file represents a
- * UNIX mount point. This attribute is %TRUE if the file is a UNIX mount
- * point. This attribute is only available for UNIX file systems.
+ *
+ * A key in the "unix" namespace for checking if the file represents a
+ * UNIX mount point. This attribute is %TRUE if the file is a UNIX mount
+ * point. This attribute is only available for UNIX file systems.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
#define G_FILE_ATTRIBUTE_UNIX_IS_MOUNTPOINT "unix::is-mountpoint" /* boolean */
@@ -543,20 +543,20 @@
/**
* G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE:
- *
- * A key in the "dos" namespace for checking if the file's archive flag
- * is set. This attribute is %TRUE if the archive flag is set. This attribute
- * is only available for DOS file systems. Corresponding #GFileAttributeType
+ *
+ * A key in the "dos" namespace for checking if the file's archive flag
+ * is set. This attribute is %TRUE if the archive flag is set. This attribute
+ * is only available for DOS file systems. Corresponding #GFileAttributeType
* is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
#define G_FILE_ATTRIBUTE_DOS_IS_ARCHIVE "dos::is-archive" /* boolean */
/**
* G_FILE_ATTRIBUTE_DOS_IS_SYSTEM:
- *
- * A key in the "dos" namespace for checking if the file's backup flag
- * is set. This attribute is %TRUE if the backup flag is set. This attribute
- * is only available for DOS file systems. Corresponding #GFileAttributeType
+ *
+ * A key in the "dos" namespace for checking if the file's backup flag
+ * is set. This attribute is %TRUE if the backup flag is set. This attribute
+ * is only available for DOS file systems. Corresponding #GFileAttributeType
* is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
#define G_FILE_ATTRIBUTE_DOS_IS_SYSTEM "dos::is-system" /* boolean */
@@ -565,25 +565,25 @@
/**
* G_FILE_ATTRIBUTE_OWNER_USER:
- *
- * A key in the "owner" namespace for getting the user name of the
- * file's owner. Corresponding #GFileAttributeType is
+ *
+ * A key in the "owner" namespace for getting the user name of the
+ * file's owner. Corresponding #GFileAttributeType is
* %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
#define G_FILE_ATTRIBUTE_OWNER_USER "owner::user" /* string */
/**
* G_FILE_ATTRIBUTE_OWNER_USER_REAL:
- *
- * A key in the "owner" namespace for getting the real name of the
- * user that owns the file. Corresponding #GFileAttributeType is
+ *
+ * A key in the "owner" namespace for getting the real name of the
+ * user that owns the file. Corresponding #GFileAttributeType is
* %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
#define G_FILE_ATTRIBUTE_OWNER_USER_REAL "owner::user-real" /* string */
/**
* G_FILE_ATTRIBUTE_OWNER_GROUP:
- *
+ *
* A key in the "owner" namespace for getting the file owner's group.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
@@ -593,18 +593,18 @@
/**
* G_FILE_ATTRIBUTE_THUMBNAIL_PATH:
- *
- * A key in the "thumbnail" namespace for getting the path to the thumbnail
- * image. Corresponding #GFileAttributeType is
+ *
+ * A key in the "thumbnail" namespace for getting the path to the thumbnail
+ * image. Corresponding #GFileAttributeType is
* %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
**/
#define G_FILE_ATTRIBUTE_THUMBNAIL_PATH "thumbnail::path" /* bytestring */
/**
* G_FILE_ATTRIBUTE_THUMBNAILING_FAILED:
- *
- * A key in the "thumbnail" namespace for checking if thumbnailing failed.
- * This attribute is %TRUE if thumbnailing failed. Corresponding
- * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
+ *
+ * A key in the "thumbnail" namespace for checking if thumbnailing failed.
+ * This attribute is %TRUE if thumbnailing failed. Corresponding
+ * #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
#define G_FILE_ATTRIBUTE_THUMBNAILING_FAILED "thumbnail::failed" /* boolean */
@@ -612,25 +612,25 @@
/**
* G_FILE_ATTRIBUTE_FILESYSTEM_SIZE:
- *
- * A key in the "filesystem" namespace for getting the total size (in bytes) of the file system,
- * used in g_file_query_filesystem_info(). Corresponding #GFileAttributeType
+ *
+ * A key in the "filesystem" namespace for getting the total size (in bytes) of the file system,
+ * used in g_file_query_filesystem_info(). Corresponding #GFileAttributeType
* is %G_FILE_ATTRIBUTE_TYPE_UINT64.
**/
#define G_FILE_ATTRIBUTE_FILESYSTEM_SIZE "filesystem::size" /* uint64 */
/**
* G_FILE_ATTRIBUTE_FILESYSTEM_FREE:
- *
- * A key in the "filesystem" namespace for getting the number of bytes of free space left on the
- * file system. Corresponding #GFileAttributeType is
+ *
+ * A key in the "filesystem" namespace for getting the number of bytes of free space left on the
+ * file system. Corresponding #GFileAttributeType is
* %G_FILE_ATTRIBUTE_TYPE_UINT64.
**/
#define G_FILE_ATTRIBUTE_FILESYSTEM_FREE "filesystem::free" /* uint64 */
/**
* G_FILE_ATTRIBUTE_FILESYSTEM_TYPE:
- *
+ *
* A key in the "filesystem" namespace for getting the file system's type.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
@@ -639,8 +639,8 @@
/**
* G_FILE_ATTRIBUTE_FILESYSTEM_READONLY:
*
- * A key in the "filesystem" namespace for checking if the file system
- * is read only. Is set to %TRUE if the file system is read only.
+ * A key in the "filesystem" namespace for checking if the file system
+ * is read only. Is set to %TRUE if the file system is read only.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
#define G_FILE_ATTRIBUTE_FILESYSTEM_READONLY "filesystem::readonly" /* boolean */
@@ -657,18 +657,18 @@
/**
* G_FILE_ATTRIBUTE_GVFS_BACKEND:
- *
+ *
* A key in the "gvfs" namespace that gets the name of the current
- * GVFS backend in use. Corresponding #GFileAttributeType is
+ * GVFS backend in use. Corresponding #GFileAttributeType is
* %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
#define G_FILE_ATTRIBUTE_GVFS_BACKEND "gvfs::backend" /* string */
/**
* G_FILE_ATTRIBUTE_SELINUX_CONTEXT:
- *
+ *
* A key in the "selinux" namespace for getting the file's SELinux
- * context. Corresponding #GFileAttributeType is
+ * context. Corresponding #GFileAttributeType is
* %G_FILE_ATTRIBUTE_TYPE_STRING. Note that this attribute is only
* available if GLib has been built with SELinux support.
**/
@@ -677,13 +677,13 @@
/**
* G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT:
*
- * A key in the "trash" namespace. When requested against
+ * A key in the "trash" namespace. When requested against
* "trash:///" returns the number of (toplevel) items in the trash folder.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT32.
**/
#define G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT "trash::item-count" /* uint32 */
-GType g_file_info_get_type (void) G_GNUC_CONST;
+GType g_file_info_get_type (void) G_GNUC_CONST;
GFileInfo * g_file_info_new (void);
GFileInfo * g_file_info_dup (GFileInfo *other);
@@ -814,5 +814,4 @@
G_END_DECLS
-
#endif /* __G_FILE_INFO_H__ */
Modified: trunk/gio/gfileinputstream.h
==============================================================================
--- trunk/gio/gfileinputstream.h (original)
+++ trunk/gio/gfileinputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -40,7 +40,7 @@
/**
* GFileInputStream:
- *
+ *
* A subclass of GInputStream for opened files. This adds
* a few file-specific operations and seeking.
*
@@ -61,26 +61,27 @@
{
GInputStreamClass parent_class;
- goffset (*tell) (GFileInputStream *stream);
- gboolean (*can_seek) (GFileInputStream *stream);
- gboolean (*seek) (GFileInputStream *stream,
- goffset offset,
- GSeekType type,
- GCancellable *cancellable,
- GError **error);
- GFileInfo *(*query_info) (GFileInputStream *stream,
- char *attributes,
- GCancellable *cancellable,
- GError **error);
- void (*query_info_async) (GFileInputStream *stream,
- char *attributes,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GFileInfo *(*query_info_finish) (GFileInputStream *stream,
- GAsyncResult *res,
- GError **error);
+ goffset (* tell) (GFileInputStream *stream);
+ gboolean (* can_seek) (GFileInputStream *stream);
+ gboolean (* seek) (GFileInputStream *stream,
+ goffset offset,
+ GSeekType type,
+ GCancellable *cancellable,
+ GError **error);
+ GFileInfo * (* query_info) (GFileInputStream *stream,
+ char *attributes,
+ GCancellable *cancellable,
+ GError **error);
+ void (* query_info_async) (GFileInputStream *stream,
+ char *attributes,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GFileInfo * (* query_info_finish) (GFileInputStream *stream,
+ GAsyncResult *res,
+ GError **error);
+
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
@@ -90,7 +91,7 @@
void (*_g_reserved5) (void);
};
-GType g_file_input_stream_get_type (void) G_GNUC_CONST;
+GType g_file_input_stream_get_type (void) G_GNUC_CONST;
GFileInfo *g_file_input_stream_query_info (GFileInputStream *stream,
char *attributes,
@@ -106,7 +107,6 @@
GAsyncResult *result,
GError **error);
-
G_END_DECLS
#endif /* __G_FILE_FILE_INPUT_STREAM_H__ */
Modified: trunk/gio/gfilemonitor.h
==============================================================================
--- trunk/gio/gfilemonitor.h (original)
+++ trunk/gio/gfilemonitor.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -43,7 +43,7 @@
/**
* GFileMonitor:
- *
+ *
* Watches for changes to a file.
**/
struct _GFileMonitor
@@ -57,15 +57,15 @@
struct _GFileMonitorClass
{
GObjectClass parent_class;
-
+
/* Signals */
- void (* changed) (GFileMonitor* monitor,
- GFile* file,
- GFile* other_file,
- GFileMonitorEvent event_type);
-
+ void (* changed) (GFileMonitor *monitor,
+ GFile *file,
+ GFile *other_file,
+ GFileMonitorEvent event_type);
+
/* Virtual Table */
- gboolean (*cancel)(GFileMonitor* monitor);
+ gboolean (* cancel) (GFileMonitor *monitor);
/*< private >*/
/* Padding for future expansion */
@@ -76,19 +76,19 @@
void (*_g_reserved5) (void);
};
-GType g_file_monitor_get_type (void) G_GNUC_CONST;
+GType g_file_monitor_get_type (void) G_GNUC_CONST;
-gboolean g_file_monitor_cancel (GFileMonitor *monitor);
-gboolean g_file_monitor_is_cancelled (GFileMonitor *monitor);
-void g_file_monitor_set_rate_limit (GFileMonitor *monitor,
- int limit_msecs);
+gboolean g_file_monitor_cancel (GFileMonitor *monitor);
+gboolean g_file_monitor_is_cancelled (GFileMonitor *monitor);
+void g_file_monitor_set_rate_limit (GFileMonitor *monitor,
+ int limit_msecs);
/* For implementations */
-void g_file_monitor_emit_event (GFileMonitor *monitor,
- GFile *child,
- GFile *other_file,
- GFileMonitorEvent event_type);
+void g_file_monitor_emit_event (GFileMonitor *monitor,
+ GFile *child,
+ GFile *other_file,
+ GFileMonitorEvent event_type);
G_END_DECLS
Modified: trunk/gio/gfilenamecompleter.h
==============================================================================
--- trunk/gio/gfilenamecompleter.h (original)
+++ trunk/gio/gfilenamecompleter.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -40,17 +40,18 @@
/**
* GFilenameCompleter:
- *
+ *
* Completes filenames based on files that exist within the file system.
**/
typedef struct _GFilenameCompleterClass GFilenameCompleterClass;
-struct _GFilenameCompleterClass {
+struct _GFilenameCompleterClass
+{
GObjectClass parent_class;
/*< public >*/
/* signals */
- void (* got_completion_data) (GFilenameCompleter *filename_completer);
+ void (* got_completion_data) (GFilenameCompleter *filename_completer);
/*< private >*/
/* Padding for future expansion */
@@ -59,16 +60,16 @@
void (*_g_reserved3) (void);
};
-GType g_filename_completer_get_type (void) G_GNUC_CONST;
+GType g_filename_completer_get_type (void) G_GNUC_CONST;
GFilenameCompleter *g_filename_completer_new (void);
char * g_filename_completer_get_completion_suffix (GFilenameCompleter *completer,
- const char *initial_text);
+ const char *initial_text);
char ** g_filename_completer_get_completions (GFilenameCompleter *completer,
- const char *initial_text);
+ const char *initial_text);
void g_filename_completer_set_dirs_only (GFilenameCompleter *completer,
- gboolean dirs_only);
+ gboolean dirs_only);
G_END_DECLS
Modified: trunk/gio/gfileoutputstream.h
==============================================================================
--- trunk/gio/gfileoutputstream.h (original)
+++ trunk/gio/gfileoutputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -52,7 +52,7 @@
struct _GFileOutputStream
{
GOutputStream parent_instance;
-
+
/*< private >*/
GFileOutputStreamPrivate *priv;
};
@@ -61,33 +61,33 @@
{
GOutputStreamClass parent_class;
- goffset (*tell) (GFileOutputStream *stream);
- gboolean (*can_seek) (GFileOutputStream *stream);
- gboolean (*seek) (GFileOutputStream *stream,
- goffset offset,
- GSeekType type,
- GCancellable *cancellable,
- GError **error);
- gboolean (*can_truncate) (GFileOutputStream *stream);
- gboolean (*truncate_fn) (GFileOutputStream *stream,
- goffset size,
- GCancellable *cancellable,
- GError **error);
- GFileInfo *(*query_info) (GFileOutputStream *stream,
- char *attributes,
- GCancellable *cancellable,
- GError **error);
- void (*query_info_async) (GFileOutputStream *stream,
- char *attributes,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GFileInfo *(*query_info_finish) (GFileOutputStream *stream,
- GAsyncResult *res,
- GError **error);
- char *(*get_etag) (GFileOutputStream *stream);
-
+ goffset (* tell) (GFileOutputStream *stream);
+ gboolean (* can_seek) (GFileOutputStream *stream);
+ gboolean (* seek) (GFileOutputStream *stream,
+ goffset offset,
+ GSeekType type,
+ GCancellable *cancellable,
+ GError **error);
+ gboolean (* can_truncate) (GFileOutputStream *stream);
+ gboolean (* truncate_fn) (GFileOutputStream *stream,
+ goffset size,
+ GCancellable *cancellable,
+ GError **error);
+ GFileInfo * (* query_info) (GFileOutputStream *stream,
+ char *attributes,
+ GCancellable *cancellable,
+ GError **error);
+ void (* query_info_async) (GFileOutputStream *stream,
+ char *attributes,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GFileInfo * (* query_info_finish) (GFileOutputStream *stream,
+ GAsyncResult *res,
+ GError **error);
+ char * (* get_etag) (GFileOutputStream *stream);
+
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
@@ -96,23 +96,23 @@
void (*_g_reserved5) (void);
};
-GType g_file_output_stream_get_type (void) G_GNUC_CONST;
+GType g_file_output_stream_get_type (void) G_GNUC_CONST;
-GFileInfo *g_file_output_stream_query_info (GFileOutputStream *stream,
- char *attributes,
- GCancellable *cancellable,
- GError **error);
-void g_file_output_stream_query_info_async (GFileOutputStream *stream,
+GFileInfo *g_file_output_stream_query_info (GFileOutputStream *stream,
+ char *attributes,
+ GCancellable *cancellable,
+ GError **error);
+void g_file_output_stream_query_info_async (GFileOutputStream *stream,
char *attributes,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
-GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream *stream,
+GFileInfo *g_file_output_stream_query_info_finish (GFileOutputStream *stream,
GAsyncResult *result,
GError **error);
-char * g_file_output_stream_get_etag (GFileOutputStream *stream);
+char * g_file_output_stream_get_etag (GFileOutputStream *stream);
G_END_DECLS
Modified: trunk/gio/gfilterinputstream.h
==============================================================================
--- trunk/gio/gfilterinputstream.h (original)
+++ trunk/gio/gfilterinputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*
- * Author: Christian Kellner <gicmo gnome org>
+ * Author: Christian Kellner <gicmo gnome org>
*/
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
@@ -40,7 +40,7 @@
/**
* GFilterInputStream:
- *
+ *
* A base class for all input streams that work on an underlying stream.
**/
typedef struct _GFilterInputStreamClass GFilterInputStreamClass;
@@ -58,7 +58,7 @@
{
GInputStreamClass parent_class;
- /*< private >*/
+ /*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
@@ -66,8 +66,9 @@
};
-GType g_filter_input_stream_get_type (void) G_GNUC_CONST;
-GInputStream *g_filter_input_stream_get_base_stream (GFilterInputStream *stream);
+GType g_filter_input_stream_get_type (void) G_GNUC_CONST;
+GInputStream * g_filter_input_stream_get_base_stream (GFilterInputStream *stream);
+
G_END_DECLS
#endif /* __G_FILTER_INPUT_STREAM_H__ */
Modified: trunk/gio/gfilteroutputstream.h
==============================================================================
--- trunk/gio/gfilteroutputstream.h (original)
+++ trunk/gio/gfilteroutputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*
- * Author: Christian Kellner <gicmo gnome org>
+ * Author: Christian Kellner <gicmo gnome org>
*/
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
@@ -40,7 +40,7 @@
/**
* GFilterOutputStream:
- *
+ *
* A base class for all output streams that work on an underlying stream.
**/
typedef struct _GFilterOutputStreamClass GFilterOutputStreamClass;
@@ -56,7 +56,7 @@
struct _GFilterOutputStreamClass
{
- GOutputStreamClass parent_class;
+ GOutputStreamClass parent_class;
/*< private >*/
/* Padding for future expansion */
@@ -66,8 +66,9 @@
};
-GType g_filter_output_stream_get_type (void) G_GNUC_CONST;
-GOutputStream *g_filter_output_stream_get_base_stream (GFilterOutputStream *stream);
+GType g_filter_output_stream_get_type (void) G_GNUC_CONST;
+GOutputStream * g_filter_output_stream_get_base_stream (GFilterOutputStream *stream);
+
G_END_DECLS
#endif /* __G_FILTER_OUTPUT_STREAM_H__ */
Modified: trunk/gio/gicon.h
==============================================================================
--- trunk/gio/gicon.h (original)
+++ trunk/gio/gicon.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -41,7 +41,7 @@
*
* An abstract type that specifies an icon.
**/
-typedef struct _GIconIface GIconIface;
+typedef struct _GIconIface GIconIface;
/**
* GIconIface:
@@ -59,16 +59,16 @@
/* Virtual Table */
- guint (*hash) (GIcon *icon);
- gboolean (*equal) (GIcon *icon1,
- GIcon *icon2);
+ guint (* hash) (GIcon *icon);
+ gboolean (* equal) (GIcon *icon1,
+ GIcon *icon2);
};
-GType g_icon_get_type (void) G_GNUC_CONST;
+GType g_icon_get_type (void) G_GNUC_CONST;
-guint g_icon_hash (gconstpointer icon);
-gboolean g_icon_equal (GIcon *icon1,
- GIcon *icon2);
+guint g_icon_hash (gconstpointer icon);
+gboolean g_icon_equal (GIcon *icon1,
+ GIcon *icon2);
G_END_DECLS
Modified: trunk/gio/ginputstream.h
==============================================================================
--- trunk/gio/ginputstream.h (original)
+++ trunk/gio/ginputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -40,7 +40,7 @@
/**
* GInputStream:
- *
+ *
* Base class for streaming input operations.
**/
typedef struct _GInputStreamClass GInputStreamClass;
@@ -59,48 +59,48 @@
GObjectClass parent_class;
/* Sync ops: */
-
- gssize (* read_fn) (GInputStream *stream,
- void *buffer,
- gsize count,
- GCancellable *cancellable,
- GError **error);
- gssize (* skip) (GInputStream *stream,
- gsize count,
- GCancellable *cancellable,
- GError **error);
- gboolean (* close_fn) (GInputStream *stream,
- GCancellable *cancellable,
- GError **error);
+
+ gssize (* read_fn) (GInputStream *stream,
+ void *buffer,
+ gsize count,
+ GCancellable *cancellable,
+ GError **error);
+ gssize (* skip) (GInputStream *stream,
+ gsize count,
+ GCancellable *cancellable,
+ GError **error);
+ gboolean (* close_fn) (GInputStream *stream,
+ GCancellable *cancellable,
+ GError **error);
/* Async ops: (optional in derived classes) */
- void (* read_async) (GInputStream *stream,
- void *buffer,
- gsize count,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gssize (* read_finish) (GInputStream *stream,
- GAsyncResult *result,
- GError **error);
- void (* skip_async) (GInputStream *stream,
- gsize count,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gssize (* skip_finish) (GInputStream *stream,
- GAsyncResult *result,
- GError **error);
- void (* close_async) (GInputStream *stream,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (* close_finish)(GInputStream *stream,
- GAsyncResult *result,
- GError **error);
+ void (* read_async) (GInputStream *stream,
+ void *buffer,
+ gsize count,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gssize (* read_finish) (GInputStream *stream,
+ GAsyncResult *result,
+ GError **error);
+ void (* skip_async) (GInputStream *stream,
+ gsize count,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gssize (* skip_finish) (GInputStream *stream,
+ GAsyncResult *result,
+ GError **error);
+ void (* close_async) (GInputStream *stream,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* close_finish) (GInputStream *stream,
+ GAsyncResult *result,
+ GError **error);
/*< private >*/
/* Padding for future expansion */
@@ -111,7 +111,7 @@
void (*_g_reserved5) (void);
};
-GType g_input_stream_get_type (void) G_GNUC_CONST;
+GType g_input_stream_get_type (void) G_GNUC_CONST;
gssize g_input_stream_read (GInputStream *stream,
void *buffer,
Modified: trunk/gio/gio.h
==============================================================================
--- trunk/gio/gio.h (original)
+++ trunk/gio/gio.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
Modified: trunk/gio/gioenums.h
==============================================================================
--- trunk/gio/gioenums.h (original)
+++ trunk/gio/gioenums.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -70,7 +70,7 @@
* @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 {
@@ -394,7 +394,7 @@
* @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.
**/
@@ -407,14 +407,14 @@
/**
* GMountOperationResult:
- * @G_MOUNT_OPERATION_HANDLED: The request was fulfilled and the
+ * @G_MOUNT_OPERATION_HANDLED: The request was fulfilled and the
* user specified data is now available
- * @G_MOUNT_OPERATION_ABORTED: The user requested the mount operation
+ * @G_MOUNT_OPERATION_ABORTED: The user requested the mount operation
* to be aborted
- * @G_MOUNT_OPERATION_UNHANDLED: The request was unhandled (i.e. not
+ * @G_MOUNT_OPERATION_UNHANDLED: The request was unhandled (i.e. not
* implemented)
- *
- * #GMountOperationResult is returned as a result when a request for
+ *
+ * #GMountOperationResult is returned as a result when a request for
* information is send by the mounting operation.
**/
typedef enum {
@@ -427,9 +427,9 @@
/**
* GOutputStreamSpliceFlags:
* @G_OUTPUT_STREAM_SPLICE_NONE: Do not close either stream.
- * @G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE: Close the source stream after
+ * @G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE: Close the source stream after
* the splice.
- * @G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET: Close the target stream after
+ * @G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET: Close the target stream after
* the splice.
*
* GOutputStreamSpliceFlags determine how streams should be spliced.
@@ -445,7 +445,7 @@
* GEmblemOrigin:
* @G_EMBLEM_ORIGIN_UNKNOWN: Emblem of unknown origin
* @G_EMBLEM_ORIGIN_DEVICE: Embleme adds device-specific information
- * @G_EMBLEM_ORIGIN_LIVEMETADATA: Emblem depicts live metadata, such as "readonly"
+ * @G_EMBLEM_ORIGIN_LIVEMETADATA: Emblem depicts live metadata, such as "readonly"
* @G_EMBLEM_ORIGIN_TAG: Emblem comes from a user-defined tag, e.g. set by nautilus (in the future)
*
* GEmblemOrigin is used to add information about the origin of the emblem
Modified: trunk/gio/gioerror.h
==============================================================================
--- trunk/gio/gioerror.h (original)
+++ trunk/gio/gioerror.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -32,16 +32,15 @@
G_BEGIN_DECLS
-GQuark g_io_error_quark (void);
-
/**
* G_IO_ERROR:
- *
+ *
* Error domain for GIO. Errors in this domain will be from the #GIOErrorEnum enumeration.
* See #GError for more information on error domains.
**/
#define G_IO_ERROR g_io_error_quark()
+GQuark g_io_error_quark (void);
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 Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -41,15 +41,15 @@
/**
* GIOModule:
- *
+ *
* Opaque module base class for extending GIO.
**/
typedef struct _GIOModuleClass GIOModuleClass;
-GType g_io_module_get_type (void) G_GNUC_CONST;
-GIOModule *g_io_module_new (const gchar *filename);
+GType g_io_module_get_type (void) G_GNUC_CONST;
+GIOModule *g_io_module_new (const gchar *filename);
-GList *g_io_modules_load_all_in_directory (const char *dirname);
+GList *g_io_modules_load_all_in_directory (const gchar *dirname);
GIOExtensionPoint *g_io_extension_point_register (const char *name);
GIOExtensionPoint *g_io_extension_point_lookup (const char *name);
@@ -64,31 +64,33 @@
const char *extension_name,
gint priority);
-GType g_io_extension_get_type (GIOExtension *extension);
-const char * g_io_extension_get_name (GIOExtension *extension);
-gint g_io_extension_get_priority (GIOExtension *extension);
-GTypeClass* g_io_extension_ref_class (GIOExtension *extension);
+GType g_io_extension_get_type (GIOExtension *extension);
+const char * g_io_extension_get_name (GIOExtension *extension);
+gint g_io_extension_get_priority (GIOExtension *extension);
+GTypeClass* g_io_extension_ref_class (GIOExtension *extension);
+
/* API for the modules to implement */
+
/**
* g_io_module_load:
* @module: a #GIOModule.
- *
- * Required API for GIO modules to implement.
- * This function is ran after the module has been loaded into GIO,
+ *
+ * Required API for GIO modules to implement.
+ * This function is ran after the module has been loaded into GIO,
* to initialize the module.
**/
-void g_io_module_load (GIOModule *module);
+void g_io_module_load (GIOModule *module);
/**
* g_io_module_unload:
* @module: a #GIOModule.
- *
- * Required API for GIO modules to implement.
- * This function is ran when the module is being unloaded from GIO,
+ *
+ * Required API for GIO modules to implement.
+ * This function is ran when the module is being unloaded from GIO,
* to finalize the module.
**/
-void g_io_module_unload (GIOModule *module);
+void g_io_module_unload (GIOModule *module);
G_END_DECLS
Modified: trunk/gio/gioscheduler.h
==============================================================================
--- trunk/gio/gioscheduler.h (original)
+++ trunk/gio/gioscheduler.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -27,7 +27,6 @@
#ifndef __G_IO_SCHEDULER_H__
#define __G_IO_SCHEDULER_H__
-#include <glib.h>
#include <gio/giotypes.h>
G_BEGIN_DECLS
Modified: trunk/gio/giotypes.h
==============================================================================
--- trunk/gio/giotypes.h (original)
+++ trunk/gio/giotypes.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -27,7 +27,6 @@
#ifndef __GIO_TYPES_H__
#define __GIO_TYPES_H__
-#include <glib-object.h>
#include <gio/gioenums.h>
G_BEGIN_DECLS
Modified: trunk/gio/gloadableicon.h
==============================================================================
--- trunk/gio/gloadableicon.h (original)
+++ trunk/gio/gloadableicon.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -38,8 +38,8 @@
/**
* GLoadableIcon:
- *
- * Generic type for all kinds of icons that can be loaded
+ *
+ * Generic type for all kinds of icons that can be loaded
* as a stream.
**/
typedef struct _GLoadableIconIface GLoadableIconIface;
@@ -50,7 +50,7 @@
* @load: Loads an icon.
* @load_async: Loads an icon asynchronously.
* @load_finish: Finishes an asynchronous icon load.
- *
+ *
* Interface for icons that can be loaded as a stream.
**/
struct _GLoadableIconIface
@@ -59,24 +59,23 @@
/* Virtual Table */
- GInputStream * (*load) (GLoadableIcon *icon,
- int size,
- char **type,
- GCancellable *cancellable,
- GError **error);
- void (*load_async) (GLoadableIcon *icon,
- int size,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- GInputStream * (*load_finish) (GLoadableIcon *icon,
- GAsyncResult *res,
- char **type,
- GError **error);
+ GInputStream * (* load) (GLoadableIcon *icon,
+ int size,
+ char **type,
+ GCancellable *cancellable,
+ GError **error);
+ void (* load_async) (GLoadableIcon *icon,
+ int size,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ GInputStream * (* load_finish) (GLoadableIcon *icon,
+ GAsyncResult *res,
+ char **type,
+ GError **error);
};
-GType g_loadable_icon_get_type (void) G_GNUC_CONST;
-
+GType g_loadable_icon_get_type (void) G_GNUC_CONST;
GInputStream *g_loadable_icon_load (GLoadableIcon *icon,
int size,
Modified: trunk/gio/glocaldirectorymonitor.h
==============================================================================
--- trunk/gio/glocaldirectorymonitor.h (original)
+++ trunk/gio/glocaldirectorymonitor.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -43,23 +43,27 @@
struct _GLocalDirectoryMonitor
{
GFileMonitor parent_instance;
- gchar *dirname;
+
+ gchar *dirname;
/* For mount emulation */
GUnixMountMonitor *mount_monitor;
- gboolean was_mounted;
+ gboolean was_mounted;
};
-struct _GLocalDirectoryMonitorClass {
+struct _GLocalDirectoryMonitorClass
+{
GFileMonitorClass parent_class;
+
gboolean mount_notify;
- gboolean (*is_supported) (void);
+
+ gboolean (* is_supported) (void);
};
-GType g_local_directory_monitor_get_type (void) G_GNUC_CONST;
+GType g_local_directory_monitor_get_type (void) G_GNUC_CONST;
-GFileMonitor* _g_local_directory_monitor_new (const char *dirname,
- GFileMonitorFlags flags,
- GError **error);
+GFileMonitor * _g_local_directory_monitor_new (const char *dirname,
+ GFileMonitorFlags flags,
+ GError **error);
G_END_DECLS
Modified: trunk/gio/glocalfile.h
==============================================================================
--- trunk/gio/glocalfile.h (original)
+++ trunk/gio/glocalfile.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -42,9 +42,9 @@
GObjectClass parent_class;
};
-GType _g_local_file_get_type (void) G_GNUC_CONST;
-
-GFile * _g_local_file_new (const char *filename);
+GType _g_local_file_get_type (void) G_GNUC_CONST;
+
+GFile * _g_local_file_new (const char *filename);
G_END_DECLS
Modified: trunk/gio/glocalfileenumerator.h
==============================================================================
--- trunk/gio/glocalfileenumerator.h (original)
+++ trunk/gio/glocalfileenumerator.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -39,20 +39,18 @@
typedef struct _GLocalFileEnumeratorClass GLocalFileEnumeratorClass;
typedef struct _GLocalFileEnumeratorPrivate GLocalFileEnumeratorPrivate;
-
struct _GLocalFileEnumeratorClass
{
GFileEnumeratorClass parent_class;
-
};
-GType _g_local_file_enumerator_get_type (void) G_GNUC_CONST;
+GType _g_local_file_enumerator_get_type (void) G_GNUC_CONST;
-GFileEnumerator *_g_local_file_enumerator_new (GLocalFile *file,
- const char *attributes,
- GFileQueryInfoFlags flags,
- GCancellable *cancellable,
- GError **error);
+GFileEnumerator * _g_local_file_enumerator_new (GLocalFile *file,
+ const char *attributes,
+ GFileQueryInfoFlags flags,
+ GCancellable *cancellable,
+ GError **error);
G_END_DECLS
Modified: trunk/gio/glocalfileinfo.h
==============================================================================
--- trunk/gio/glocalfileinfo.h (original)
+++ trunk/gio/glocalfileinfo.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -32,12 +32,13 @@
G_BEGIN_DECLS
-typedef struct {
+typedef struct
+{
gboolean writable;
gboolean is_sticky;
gboolean has_trash_dir;
- int owner;
- dev_t device;
+ int owner;
+ dev_t device;
} GLocalParentFileInfo;
#ifdef G_OS_WIN32
@@ -47,33 +48,33 @@
#define GLocalFileStat struct stat
#endif
-gboolean _g_local_file_has_trash_dir (const char *dirname,
- dev_t dir_dev);
-void _g_local_file_info_get_parent_info (const char *dir,
- GFileAttributeMatcher *attribute_matcher,
- GLocalParentFileInfo *parent_info);
-GFileInfo *_g_local_file_info_get (const char *basename,
- const char *path,
- GFileAttributeMatcher *attribute_matcher,
- GFileQueryInfoFlags flags,
- GLocalParentFileInfo *parent_info,
- GError **error);
-GFileInfo *_g_local_file_info_get_from_fd (int fd,
- char *attributes,
- GError **error);
-char * _g_local_file_info_create_etag (GLocalFileStat *statbuf);
-gboolean _g_local_file_info_set_attribute (char *filename,
- const char *attribute,
- GFileAttributeType type,
- gpointer value_p,
- GFileQueryInfoFlags flags,
- GCancellable *cancellable,
- GError **error);
-gboolean _g_local_file_info_set_attributes (char *filename,
- GFileInfo *info,
- GFileQueryInfoFlags flags,
- GCancellable *cancellable,
- GError **error);
+gboolean _g_local_file_has_trash_dir (const char *dirname,
+ dev_t dir_dev);
+void _g_local_file_info_get_parent_info (const char *dir,
+ GFileAttributeMatcher *attribute_matcher,
+ GLocalParentFileInfo *parent_info);
+GFileInfo *_g_local_file_info_get (const char *basename,
+ const char *path,
+ GFileAttributeMatcher *attribute_matcher,
+ GFileQueryInfoFlags flags,
+ GLocalParentFileInfo *parent_info,
+ GError **error);
+GFileInfo *_g_local_file_info_get_from_fd (int fd,
+ char *attributes,
+ GError **error);
+char * _g_local_file_info_create_etag (GLocalFileStat *statbuf);
+gboolean _g_local_file_info_set_attribute (char *filename,
+ const char *attribute,
+ GFileAttributeType type,
+ gpointer value_p,
+ GFileQueryInfoFlags flags,
+ GCancellable *cancellable,
+ GError **error);
+gboolean _g_local_file_info_set_attributes (char *filename,
+ GFileInfo *info,
+ GFileQueryInfoFlags flags,
+ GCancellable *cancellable,
+ GError **error);
G_END_DECLS
Modified: trunk/gio/glocalfileinputstream.h
==============================================================================
--- trunk/gio/glocalfileinputstream.h (original)
+++ trunk/gio/glocalfileinputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -51,9 +51,9 @@
GFileInputStreamClass parent_class;
};
-GType _g_local_file_input_stream_get_type (void) G_GNUC_CONST;
+GType _g_local_file_input_stream_get_type (void) G_GNUC_CONST;
-GFileInputStream *_g_local_file_input_stream_new (int fd);
+GFileInputStream * _g_local_file_input_stream_new (int fd);
G_END_DECLS
Modified: trunk/gio/glocalfilemonitor.h
==============================================================================
--- trunk/gio/glocalfilemonitor.h (original)
+++ trunk/gio/glocalfilemonitor.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -41,19 +41,22 @@
struct _GLocalFileMonitor
{
GFileMonitor parent_instance;
+
gchar *filename;
};
-struct _GLocalFileMonitorClass {
+struct _GLocalFileMonitorClass
+{
GFileMonitorClass parent_class;
- gboolean (*is_supported) (void);
+
+ gboolean (* is_supported) (void);
};
-GType g_local_file_monitor_get_type (void) G_GNUC_CONST;
+GType g_local_file_monitor_get_type (void) G_GNUC_CONST;
-GFileMonitor* _g_local_file_monitor_new (const char *pathname,
- GFileMonitorFlags flags,
- GError **error);
+GFileMonitor * _g_local_file_monitor_new (const char *pathname,
+ GFileMonitorFlags flags,
+ GError **error);
G_END_DECLS
Modified: trunk/gio/glocalfileoutputstream.h
==============================================================================
--- trunk/gio/glocalfileoutputstream.h (original)
+++ trunk/gio/glocalfileoutputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -51,21 +51,21 @@
GFileOutputStreamClass parent_class;
};
-GType _g_local_file_output_stream_get_type (void) G_GNUC_CONST;
-GFileOutputStream *_g_local_file_output_stream_create (const char *filename,
- GFileCreateFlags flags,
- GCancellable *cancellable,
- GError **error);
-GFileOutputStream *_g_local_file_output_stream_append (const char *filename,
- GFileCreateFlags flags,
- GCancellable *cancellable,
- GError **error);
-GFileOutputStream *_g_local_file_output_stream_replace (const char *filename,
- const char *etag,
- gboolean create_backup,
- GFileCreateFlags flags,
- GCancellable *cancellable,
- GError **error);
+GType _g_local_file_output_stream_get_type (void) G_GNUC_CONST;
+GFileOutputStream * _g_local_file_output_stream_create (const char *filename,
+ GFileCreateFlags flags,
+ GCancellable *cancellable,
+ GError **error);
+GFileOutputStream * _g_local_file_output_stream_append (const char *filename,
+ GFileCreateFlags flags,
+ GCancellable *cancellable,
+ GError **error);
+GFileOutputStream * _g_local_file_output_stream_replace (const char *filename,
+ const char *etag,
+ gboolean create_backup,
+ GFileCreateFlags flags,
+ GCancellable *cancellable,
+ GError **error);
G_END_DECLS
Modified: trunk/gio/glocalvfs.h
==============================================================================
--- trunk/gio/glocalvfs.h (original)
+++ trunk/gio/glocalvfs.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -27,20 +27,19 @@
G_BEGIN_DECLS
-#define G_TYPE_LOCAL_VFS (_g_local_vfs_get_type ())
-#define G_LOCAL_VFS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_LOCAL_VFS, GLocalVfs))
-#define G_LOCAL_VFS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), G_TYPE_LOCAL_VFS, GLocalVfsClass))
-#define G_IS_LOCAL_VFS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_LOCAL_VFS))
-#define G_IS_LOCAL_VFS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), G_TYPE_LOCAL_VFS))
-#define G_LOCAL_VFS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G_TYPE_LOCAL_VFS, GLocalVfsClass))
+#define G_TYPE_LOCAL_VFS (_g_local_vfs_get_type ())
+#define G_LOCAL_VFS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), G_TYPE_LOCAL_VFS, GLocalVfs))
+#define G_LOCAL_VFS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), G_TYPE_LOCAL_VFS, GLocalVfsClass))
+#define G_IS_LOCAL_VFS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_LOCAL_VFS))
+#define G_IS_LOCAL_VFS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), G_TYPE_LOCAL_VFS))
+#define G_LOCAL_VFS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), G_TYPE_LOCAL_VFS, GLocalVfsClass))
typedef struct _GLocalVfs GLocalVfs;
typedef struct _GLocalVfsClass GLocalVfsClass;
GType _g_local_vfs_get_type (void) G_GNUC_CONST;
-GVfs *_g_local_vfs_new (void);
-
+GVfs * _g_local_vfs_new (void);
G_END_DECLS
Modified: trunk/gio/gmemoryinputstream.h
==============================================================================
--- trunk/gio/gmemoryinputstream.h (original)
+++ trunk/gio/gmemoryinputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307, USA.
*
- * Author: Christian Kellner <gicmo gnome org>
+ * Author: Christian Kellner <gicmo gnome org>
*/
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
@@ -40,7 +40,7 @@
/**
* GMemoryInputStream:
- *
+ *
* Implements #GInputStream for arbitrary memory chunks.
**/
typedef struct _GMemoryInputStreamClass GMemoryInputStreamClass;
@@ -56,7 +56,7 @@
struct _GMemoryInputStreamClass
{
- GInputStreamClass parent_class;
+ GInputStreamClass parent_class;
/* Padding for future expansion */
void (*_g_reserved1) (void);
@@ -67,15 +67,15 @@
};
-GType g_memory_input_stream_get_type (void) G_GNUC_CONST;
-GInputStream * g_memory_input_stream_new (void);
-GInputStream * g_memory_input_stream_new_from_data (const void *data,
- gssize len,
- GDestroyNotify destroy);
-void g_memory_input_stream_add_data (GMemoryInputStream *stream,
- const void *data,
- gssize len,
- GDestroyNotify destroy);
+GType g_memory_input_stream_get_type (void) G_GNUC_CONST;
+GInputStream * g_memory_input_stream_new (void);
+GInputStream * g_memory_input_stream_new_from_data (const void *data,
+ gssize len,
+ GDestroyNotify destroy);
+void g_memory_input_stream_add_data (GMemoryInputStream *stream,
+ const void *data,
+ gssize len,
+ GDestroyNotify destroy);
G_END_DECLS
Modified: trunk/gio/gmemoryoutputstream.h
==============================================================================
--- trunk/gio/gmemoryoutputstream.h (original)
+++ trunk/gio/gmemoryoutputstream.h Tue Sep 2 19:05:58 2008
@@ -56,7 +56,7 @@
struct _GMemoryOutputStreamClass
{
- GOutputStreamClass parent_class;
+ GOutputStreamClass parent_class;
/*< private >*/
/* Padding for future expansion */
@@ -79,8 +79,8 @@
*
* Returns: a pointer to the reallocated memory
*/
-typedef gpointer (*GReallocFunc) (gpointer data,
- gsize size);
+typedef gpointer (* GReallocFunc) (gpointer data,
+ gsize size);
GType g_memory_output_stream_get_type (void) G_GNUC_CONST;
Modified: trunk/gio/gmount.h
==============================================================================
--- trunk/gio/gmount.h (original)
+++ trunk/gio/gmount.h Tue Sep 2 19:05:58 2008
@@ -1,7 +1,7 @@
/* GIO - GLib Input, Output and Streaming Library
- *
+ *
* Copyright (C) 2006-2008 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
@@ -63,7 +63,7 @@
* type guessing. This operation was added in 2.18.
* @guess_content_type_finish: Finishes a contenet type guessing operation.
* @guess_content_type_sync: Synchronous variant of @guess_content_type.
- *
+ *
* Interface for implementing operations for mounts.
**/
struct _GMountIface
@@ -72,107 +72,110 @@
/* signals */
- void (*changed) (GMount *mount);
- void (*unmounted) (GMount *mount);
-
+ void (* changed) (GMount *mount);
+ void (* unmounted) (GMount *mount);
+
/* Virtual Table */
- GFile * (*get_root) (GMount *mount);
- char * (*get_name) (GMount *mount);
- GIcon * (*get_icon) (GMount *mount);
- char * (*get_uuid) (GMount *mount);
- GVolume * (*get_volume) (GMount *mount);
- GDrive * (*get_drive) (GMount *mount);
- gboolean (*can_unmount) (GMount *mount);
- gboolean (*can_eject) (GMount *mount);
- void (*unmount) (GMount *mount,
- GMountUnmountFlags flags,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*unmount_finish) (GMount *mount,
- GAsyncResult *result,
- GError **error);
- void (*eject) (GMount *mount,
- GMountUnmountFlags flags,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*eject_finish) (GMount *mount,
- GAsyncResult *result,
- GError **error);
- void (*remount) (GMount *mount,
- GMountMountFlags flags,
- GMountOperation *mount_operation,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*remount_finish) (GMount *mount,
- GAsyncResult *result,
- GError **error);
-
- void (*guess_content_type) (GMount *mount,
- gboolean force_rescan,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
- gchar ** (*guess_content_type_finish) (GMount *mount,
- GAsyncResult *result,
- GError **error);
-
- gchar ** (*guess_content_type_sync) (GMount *mount,
- gboolean force_rescan,
- GCancellable *cancellable,
- GError **error);
+ GFile * (* get_root) (GMount *mount);
+ char * (* get_name) (GMount *mount);
+ GIcon * (* get_icon) (GMount *mount);
+ char * (* get_uuid) (GMount *mount);
+ GVolume * (* get_volume) (GMount *mount);
+ GDrive * (* get_drive) (GMount *mount);
+ gboolean (* can_unmount) (GMount *mount);
+ gboolean (* can_eject) (GMount *mount);
+
+ void (* unmount) (GMount *mount,
+ GMountUnmountFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* unmount_finish) (GMount *mount,
+ GAsyncResult *result,
+ GError **error);
+
+ void (* eject) (GMount *mount,
+ GMountUnmountFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* eject_finish) (GMount *mount,
+ GAsyncResult *result,
+ GError **error);
+
+ void (* remount) (GMount *mount,
+ GMountMountFlags flags,
+ GMountOperation *mount_operation,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* remount_finish) (GMount *mount,
+ GAsyncResult *result,
+ GError **error);
+
+ void (* guess_content_type) (GMount *mount,
+ gboolean force_rescan,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gchar ** (* guess_content_type_finish) (GMount *mount,
+ GAsyncResult *result,
+ GError **error);
+ gchar ** (* guess_content_type_sync) (GMount *mount,
+ gboolean force_rescan,
+ GCancellable *cancellable,
+ GError **error);
};
-GType g_mount_get_type (void) G_GNUC_CONST;
+GType g_mount_get_type (void) G_GNUC_CONST;
+
+GFile * g_mount_get_root (GMount *mount);
+char * g_mount_get_name (GMount *mount);
+GIcon * g_mount_get_icon (GMount *mount);
+char * g_mount_get_uuid (GMount *mount);
+GVolume * g_mount_get_volume (GMount *mount);
+GDrive * g_mount_get_drive (GMount *mount);
+gboolean g_mount_can_unmount (GMount *mount);
+gboolean g_mount_can_eject (GMount *mount);
+
+void g_mount_unmount (GMount *mount,
+ GMountUnmountFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean g_mount_unmount_finish (GMount *mount,
+ GAsyncResult *result,
+ GError **error);
+
+void g_mount_eject (GMount *mount,
+ GMountUnmountFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean g_mount_eject_finish (GMount *mount,
+ GAsyncResult *result,
+ GError **error);
-GFile * g_mount_get_root (GMount *mount);
-char * g_mount_get_name (GMount *mount);
-GIcon * g_mount_get_icon (GMount *mount);
-char * g_mount_get_uuid (GMount *mount);
-GVolume * g_mount_get_volume (GMount *mount);
-GDrive * g_mount_get_drive (GMount *mount);
-gboolean g_mount_can_unmount (GMount *mount);
-gboolean g_mount_can_eject (GMount *mount);
-void g_mount_unmount (GMount *mount,
- GMountUnmountFlags flags,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gboolean g_mount_unmount_finish (GMount *mount,
- GAsyncResult *result,
- GError **error);
-void g_mount_eject (GMount *mount,
- GMountUnmountFlags flags,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gboolean g_mount_eject_finish (GMount *mount,
- GAsyncResult *result,
- GError **error);
-void g_mount_remount (GMount *mount,
- GMountMountFlags flags,
- GMountOperation *mount_operation,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gboolean g_mount_remount_finish (GMount *mount,
- GAsyncResult *result,
- GError **error);
-
-void g_mount_guess_content_type (GMount *mount,
- gboolean force_rescan,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-gchar ** g_mount_guess_content_type_finish (GMount *mount,
- GAsyncResult *result,
- GError **error);
+void g_mount_remount (GMount *mount,
+ GMountMountFlags flags,
+ GMountOperation *mount_operation,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gboolean g_mount_remount_finish (GMount *mount,
+ GAsyncResult *result,
+ GError **error);
-gchar ** g_mount_guess_content_type_sync (GMount *mount,
+void g_mount_guess_content_type (GMount *mount,
+ gboolean force_rescan,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+gchar ** g_mount_guess_content_type_finish (GMount *mount,
+ GAsyncResult *result,
+ GError **error);
+gchar ** g_mount_guess_content_type_sync (GMount *mount,
gboolean force_rescan,
GCancellable *cancellable,
GError **error);
Modified: trunk/gio/gmountoperation.h
==============================================================================
--- trunk/gio/gmountoperation.h (original)
+++ trunk/gio/gmountoperation.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -40,8 +40,8 @@
/**
* GMountOperation:
- *
- * Class for providing authentication methods for mounting operations,
+ *
+ * Class for providing authentication methods for mounting operations,
* such as mounting a file locally, or authenticating with a server.
**/
typedef struct _GMountOperationClass GMountOperationClass;
@@ -60,19 +60,19 @@
/* signals: */
- void (* ask_password) (GMountOperation *op,
- const char *message,
- const char *default_user,
- const char *default_domain,
- GAskPasswordFlags flags);
-
- void (* ask_question) (GMountOperation *op,
- const char *message,
- const char *choices[]);
-
- void (* reply) (GMountOperation *op,
- GMountOperationResult result);
-
+ void (* ask_password) (GMountOperation *op,
+ const char *message,
+ const char *default_user,
+ const char *default_domain,
+ GAskPasswordFlags flags);
+
+ void (* ask_question) (GMountOperation *op,
+ const char *message,
+ const char *choices[]);
+
+ void (* reply) (GMountOperation *op,
+ GMountOperationResult result);
+
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
@@ -89,9 +89,8 @@
void (*_g_reserved12) (void);
};
-GType g_mount_operation_get_type (void) G_GNUC_CONST;
-
-GMountOperation * g_mount_operation_new (void);
+GType g_mount_operation_get_type (void) G_GNUC_CONST;
+GMountOperation * g_mount_operation_new (void);
const char * g_mount_operation_get_username (GMountOperation *op);
void g_mount_operation_set_username (GMountOperation *op,
Modified: trunk/gio/gnativevolumemonitor.h
==============================================================================
--- trunk/gio/gnativevolumemonitor.h (original)
+++ trunk/gio/gnativevolumemonitor.h Tue Sep 2 19:05:58 2008
@@ -16,20 +16,21 @@
typedef struct _GNativeVolumeMonitor GNativeVolumeMonitor;
typedef struct _GNativeVolumeMonitorClass GNativeVolumeMonitorClass;
-struct _GNativeVolumeMonitor {
+struct _GNativeVolumeMonitor
+{
GVolumeMonitor parent_instance;
};
-struct _GNativeVolumeMonitorClass {
+struct _GNativeVolumeMonitorClass
+{
GVolumeMonitorClass parent_class;
- GMount * (*get_mount_for_mount_path) (const char *mount_path,
- GCancellable *cancellable);
+ GMount * (* get_mount_for_mount_path) (const char *mount_path,
+ GCancellable *cancellable);
};
GType g_native_volume_monitor_get_type (void) G_GNUC_CONST;
-
G_END_DECLS
#endif /* __G_NATIVE_VOLUME_MONITOR_H__ */
Modified: trunk/gio/goutputstream.h
==============================================================================
--- trunk/gio/goutputstream.h (original)
+++ trunk/gio/goutputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -40,10 +40,10 @@
/**
* GOutputStream:
- *
- * Base class for writing output.
- *
- * All classes derived from GOutputStream should implement synchronous
+ *
+ * Base class for writing output.
+ *
+ * All classes derived from GOutputStream should implement synchronous
* writing, splicing, flushing and closing streams, but may implement
* asynchronous versions.
**/
@@ -53,7 +53,7 @@
struct _GOutputStream
{
GObject parent_instance;
-
+
/*< private >*/
GOutputStreamPrivate *priv;
};
@@ -64,62 +64,62 @@
GObjectClass parent_class;
/* Sync ops: */
-
- gssize (* write_fn)(GOutputStream *stream,
- const void *buffer,
- gsize count,
- GCancellable *cancellable,
- GError **error);
- gssize (* splice) (GOutputStream *stream,
- GInputStream *source,
- GOutputStreamSpliceFlags flags,
- GCancellable *cancellable,
- GError **error);
- gboolean (* flush) (GOutputStream *stream,
- GCancellable *cancellable,
- GError **error);
- gboolean (* close_fn)(GOutputStream *stream,
- GCancellable *cancellable,
- GError **error);
-
+
+ gssize (* write_fn) (GOutputStream *stream,
+ const void *buffer,
+ gsize count,
+ GCancellable *cancellable,
+ GError **error);
+ gssize (* splice) (GOutputStream *stream,
+ GInputStream *source,
+ GOutputStreamSpliceFlags flags,
+ GCancellable *cancellable,
+ GError **error);
+ gboolean (* flush) (GOutputStream *stream,
+ GCancellable *cancellable,
+ GError **error);
+ gboolean (* close_fn) (GOutputStream *stream,
+ GCancellable *cancellable,
+ GError **error);
+
/* Async ops: (optional in derived classes) */
- void (* write_async) (GOutputStream *stream,
- const void *buffer,
- gsize count,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gssize (* write_finish) (GOutputStream *stream,
- GAsyncResult *result,
- GError **error);
- void (* splice_async) (GOutputStream *stream,
- GInputStream *source,
- GOutputStreamSpliceFlags flags,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer data);
- gssize (* splice_finish)(GOutputStream *stream,
- GAsyncResult *result,
- GError **error);
- void (* flush_async) (GOutputStream *stream,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (* flush_finish) (GOutputStream *stream,
- GAsyncResult *result,
- GError **error);
- void (* close_async) (GOutputStream *stream,
- int io_priority,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (* close_finish) (GOutputStream *stream,
- GAsyncResult *result,
- GError **error);
+ void (* write_async) (GOutputStream *stream,
+ const void *buffer,
+ gsize count,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gssize (* write_finish) (GOutputStream *stream,
+ GAsyncResult *result,
+ GError **error);
+ void (* splice_async) (GOutputStream *stream,
+ GInputStream *source,
+ GOutputStreamSpliceFlags flags,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer data);
+ gssize (* splice_finish) (GOutputStream *stream,
+ GAsyncResult *result,
+ GError **error);
+ void (* flush_async) (GOutputStream *stream,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* flush_finish) (GOutputStream *stream,
+ GAsyncResult *result,
+ GError **error);
+ void (* close_async) (GOutputStream *stream,
+ int io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* close_finish) (GOutputStream *stream,
+ GAsyncResult *result,
+ GError **error);
/*< private >*/
/* Padding for future expansion */
@@ -133,8 +133,8 @@
void (*_g_reserved8) (void);
};
-GType g_output_stream_get_type (void) G_GNUC_CONST;
-
+GType g_output_stream_get_type (void) G_GNUC_CONST;
+
gssize g_output_stream_write (GOutputStream *stream,
const void *buffer,
gsize count,
Modified: trunk/gio/gpollfilemonitor.h
==============================================================================
--- trunk/gio/gpollfilemonitor.h (original)
+++ trunk/gio/gpollfilemonitor.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -36,13 +36,14 @@
typedef struct _GPollFileMonitor GPollFileMonitor;
typedef struct _GPollFileMonitorClass GPollFileMonitorClass;
-struct _GPollFileMonitorClass {
+struct _GPollFileMonitorClass
+{
GFileMonitorClass parent_class;
};
-GType _g_poll_file_monitor_get_type (void) G_GNUC_CONST;
+GType _g_poll_file_monitor_get_type (void) G_GNUC_CONST;
-GFileMonitor* _g_poll_file_monitor_new (GFile *file);
+GFileMonitor * _g_poll_file_monitor_new (GFile *file);
G_END_DECLS
Modified: trunk/gio/gseekable.h
==============================================================================
--- trunk/gio/gseekable.h (original)
+++ trunk/gio/gseekable.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -38,9 +38,9 @@
/**
* GSeekable:
- *
+ *
* Seek object for streaming operations.
- **/
+ **/
typedef struct _GSeekableIface GSeekableIface;
/**
@@ -51,24 +51,24 @@
* @seek: Seeks to a location within a stream.
* @can_truncate: Chekcs if truncation is suppored by the stream.
* @truncate_fn: Truncates a stream.
- *
+ *
* Provides an interface for implementing seekable functionality on I/O Streams.
- **/
+ **/
struct _GSeekableIface
{
GTypeInterface g_iface;
/* Virtual Table */
-
+
goffset (* tell) (GSeekable *seekable);
-
+
gboolean (* can_seek) (GSeekable *seekable);
gboolean (* seek) (GSeekable *seekable,
goffset offset,
GSeekType type,
GCancellable *cancellable,
GError **error);
-
+
gboolean (* can_truncate) (GSeekable *seekable);
gboolean (* truncate_fn) (GSeekable *seekable,
goffset offset,
@@ -78,7 +78,7 @@
/* TODO: Async seek/truncate */
};
-GType g_seekable_get_type (void) G_GNUC_CONST;
+GType g_seekable_get_type (void) G_GNUC_CONST;
goffset g_seekable_tell (GSeekable *seekable);
gboolean g_seekable_can_seek (GSeekable *seekable);
Modified: trunk/gio/gsimpleasyncresult.h
==============================================================================
--- trunk/gio/gsimpleasyncresult.h (original)
+++ trunk/gio/gsimpleasyncresult.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -40,14 +40,14 @@
/**
* GSimpleAsyncResult:
- *
+ *
* A simple implementation of #GAsyncResult.
**/
typedef struct _GSimpleAsyncResultClass GSimpleAsyncResultClass;
-GType g_simple_async_result_get_type (void) G_GNUC_CONST;
-
+GType g_simple_async_result_get_type (void) G_GNUC_CONST;
+
GSimpleAsyncResult *g_simple_async_result_new (GObject *source_object,
GAsyncReadyCallback callback,
gpointer user_data,
@@ -103,20 +103,20 @@
const char *format,
va_list args);
-void g_simple_async_report_error_in_idle (GObject *object,
+void g_simple_async_report_error_in_idle (GObject *object,
GAsyncReadyCallback callback,
- gpointer user_data,
- GQuark domain,
- gint code,
- const char *format,
+ gpointer user_data,
+ GQuark domain,
+ gint code,
+ const char *format,
...);
-void g_simple_async_report_gerror_in_idle (GObject *object,
+void g_simple_async_report_gerror_in_idle (GObject *object,
GAsyncReadyCallback callback,
- gpointer user_data,
- GError *error);
+ gpointer user_data,
+ GError *error);
G_END_DECLS
-
+
#endif /* __G_SIMPLE_ASYNC_RESULT_H__ */
Modified: trunk/gio/gthemedicon.h
==============================================================================
--- trunk/gio/gthemedicon.h (original)
+++ trunk/gio/gthemedicon.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -40,20 +40,20 @@
/**
* GThemedIcon:
- *
+ *
* An implementation of #GIcon for themed icons.
**/
typedef struct _GThemedIconClass GThemedIconClass;
-GType g_themed_icon_get_type (void) G_GNUC_CONST;
-
+GType g_themed_icon_get_type (void) G_GNUC_CONST;
+
GIcon *g_themed_icon_new (const char *iconname);
GIcon *g_themed_icon_new_with_default_fallbacks (const char *iconname);
-GIcon *g_themed_icon_new_from_names (char **iconnames,
+GIcon *g_themed_icon_new_from_names (char **iconnames,
int len);
-void g_themed_icon_prepend_name (GThemedIcon *icon,
+void g_themed_icon_prepend_name (GThemedIcon *icon,
const char *iconname);
-void g_themed_icon_append_name (GThemedIcon *icon,
+void g_themed_icon_append_name (GThemedIcon *icon,
const char *iconname);
const char * const *g_themed_icon_get_names (GThemedIcon *icon);
Modified: trunk/gio/gunionvolumemonitor.h
==============================================================================
--- trunk/gio/gunionvolumemonitor.h (original)
+++ trunk/gio/gunionvolumemonitor.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -37,7 +37,8 @@
typedef struct _GUnionVolumeMonitor GUnionVolumeMonitor;
typedef struct _GUnionVolumeMonitorClass GUnionVolumeMonitorClass;
-struct _GUnionVolumeMonitorClass {
+struct _GUnionVolumeMonitorClass
+{
GVolumeMonitorClass parent_class;
};
Modified: trunk/gio/gunixinputstream.h
==============================================================================
--- trunk/gio/gunixinputstream.h (original)
+++ trunk/gio/gunixinputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -36,7 +36,7 @@
/**
* GUnixInputStream:
- *
+ *
* Implements #GInputStream for reading from selectable unix file descriptors
**/
typedef struct _GUnixInputStream GUnixInputStream;
@@ -64,10 +64,10 @@
void (*_g_reserved5) (void);
};
-GType g_unix_input_stream_get_type (void) G_GNUC_CONST;
+GType g_unix_input_stream_get_type (void) G_GNUC_CONST;
-GInputStream *g_unix_input_stream_new (int fd,
- gboolean close_fd_at_close);
+GInputStream * g_unix_input_stream_new (int fd,
+ gboolean close_fd_at_close);
G_END_DECLS
Modified: trunk/gio/gunixmount.h
==============================================================================
--- trunk/gio/gunixmount.h (original)
+++ trunk/gio/gunixmount.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -38,20 +38,21 @@
typedef struct _GUnixMountClass GUnixMountClass;
-struct _GUnixMountClass {
- GObjectClass parent_class;
+struct _GUnixMountClass
+{
+ GObjectClass parent_class;
};
-GType _g_unix_mount_get_type (void) G_GNUC_CONST;
+GType _g_unix_mount_get_type (void) G_GNUC_CONST;
-GUnixMount *_g_unix_mount_new (GVolumeMonitor *volume_monitor,
- GUnixMountEntry *mount_entry,
- GUnixVolume *volume);
-gboolean _g_unix_mount_has_mount_path (GUnixMount *mount,
- const char *mount_path);
-void _g_unix_mount_unset_volume (GUnixMount *mount,
- GUnixVolume *volume);
-void _g_unix_mount_unmounted (GUnixMount *mount);
+GUnixMount * _g_unix_mount_new (GVolumeMonitor *volume_monitor,
+ GUnixMountEntry *mount_entry,
+ GUnixVolume *volume);
+gboolean _g_unix_mount_has_mount_path (GUnixMount *mount,
+ const char *mount_path);
+void _g_unix_mount_unset_volume (GUnixMount *mount,
+ GUnixVolume *volume);
+void _g_unix_mount_unmounted (GUnixMount *mount);
G_END_DECLS
Modified: trunk/gio/gunixmounts.h
==============================================================================
--- trunk/gio/gunixmounts.h (original)
+++ trunk/gio/gunixmounts.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -29,15 +29,15 @@
/**
* GUnixMountEntry:
- *
- * Defines a Unix mount entry (e.g. <filename>/media/cdrom</filename>).
+ *
+ * Defines a Unix mount entry (e.g. <filename>/media/cdrom</filename>).
* This corresponds roughly to a mtab entry.
**/
typedef struct _GUnixMountEntry GUnixMountEntry;
/**
* GUnixMountPoint:
- *
+ *
* Defines a Unix mount point (e.g. <filename>/dev</filename>).
* This corresponds roughly to a fstab entry.
**/
@@ -45,7 +45,7 @@
/**
* GUnixMountMonitor:
- *
+ *
* Watches #GUnixMount<!-- -->s for changes.
**/
typedef struct _GUnixMountMonitor GUnixMountMonitor;
Modified: trunk/gio/gunixoutputstream.h
==============================================================================
--- trunk/gio/gunixoutputstream.h (original)
+++ trunk/gio/gunixoutputstream.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -36,7 +36,7 @@
/**
* GUnixOutputStream:
- *
+ *
* Implements #GOutputStream for outputting to selectable unix file descriptors
**/
typedef struct _GUnixOutputStream GUnixOutputStream;
@@ -64,10 +64,10 @@
void (*_g_reserved5) (void);
};
-GType g_unix_output_stream_get_type (void) G_GNUC_CONST;
+GType g_unix_output_stream_get_type (void) G_GNUC_CONST;
-GOutputStream *g_unix_output_stream_new (int fd,
- gboolean close_fd_at_close);
+GOutputStream * g_unix_output_stream_new (int fd,
+ gboolean close_fd_at_close);
G_END_DECLS
Modified: trunk/gio/gunixvolume.h
==============================================================================
--- trunk/gio/gunixvolume.h (original)
+++ trunk/gio/gunixvolume.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -38,21 +38,22 @@
typedef struct _GUnixVolumeClass GUnixVolumeClass;
-struct _GUnixVolumeClass {
- GObjectClass parent_class;
+struct _GUnixVolumeClass
+{
+ GObjectClass parent_class;
};
-GType _g_unix_volume_get_type (void) G_GNUC_CONST;
+GType _g_unix_volume_get_type (void) G_GNUC_CONST;
-GUnixVolume *_g_unix_volume_new (GVolumeMonitor *volume_monitor,
- GUnixMountPoint *mountpoint);
-gboolean _g_unix_volume_has_mount_path (GUnixVolume *volume,
- const char *mount_path);
-void _g_unix_volume_set_mount (GUnixVolume *volume,
- GUnixMount *mount);
-void _g_unix_volume_unset_mount (GUnixVolume *volume,
- GUnixMount *mount);
-void _g_unix_volume_disconnected (GUnixVolume *volume);
+GUnixVolume * _g_unix_volume_new (GVolumeMonitor *volume_monitor,
+ GUnixMountPoint *mountpoint);
+gboolean _g_unix_volume_has_mount_path (GUnixVolume *volume,
+ const char *mount_path);
+void _g_unix_volume_set_mount (GUnixVolume *volume,
+ GUnixMount *mount);
+void _g_unix_volume_unset_mount (GUnixVolume *volume,
+ GUnixMount *mount);
+void _g_unix_volume_disconnected (GUnixVolume *volume);
G_END_DECLS
Modified: trunk/gio/gunixvolumemonitor.h
==============================================================================
--- trunk/gio/gunixvolumemonitor.h (original)
+++ trunk/gio/gunixvolumemonitor.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -47,15 +47,15 @@
typedef struct _GUnixMount GUnixMount;
typedef struct _GUnixVolume GUnixVolume;
-struct _GUnixVolumeMonitorClass {
+struct _GUnixVolumeMonitorClass
+{
GNativeVolumeMonitorClass parent_class;
-
};
-GType _g_unix_volume_monitor_get_type (void) G_GNUC_CONST;
+GType _g_unix_volume_monitor_get_type (void) G_GNUC_CONST;
GVolumeMonitor * _g_unix_volume_monitor_new (void);
-GUnixVolume * _g_unix_volume_monitor_lookup_volume_for_mount_path (GUnixVolumeMonitor *monitor,
+GUnixVolume * _g_unix_volume_monitor_lookup_volume_for_mount_path (GUnixVolumeMonitor *monitor,
const char *mount_path);
G_END_DECLS
Modified: trunk/gio/gvfs.h
==============================================================================
--- trunk/gio/gvfs.h (original)
+++ trunk/gio/gvfs.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -41,19 +41,20 @@
/**
* G_VFS_EXTENSION_POINT_NAME:
*
- * Extension point for #GVfs functionality.
+ * Extension point for #GVfs functionality.
* See <link linkend="extending-gio">Extending GIO</link>.
*/
#define G_VFS_EXTENSION_POINT_NAME "gio-vfs"
/**
* GVfs:
- *
+ *
* Virtual File System object.
**/
typedef struct _GVfsClass GVfsClass;
-struct _GVfs {
+struct _GVfs
+{
GObject parent_instance;
};
@@ -63,15 +64,14 @@
/* Virtual Table */
- gboolean (*is_active) (GVfs *vfs);
- GFile *(*get_file_for_path) (GVfs *vfs,
- const char *path);
- GFile *(*get_file_for_uri) (GVfs *vfs,
- const char *uri);
- const gchar * const *(*get_supported_uri_schemes) (GVfs *vfs);
- GFile *(*parse_name) (GVfs *vfs,
- const char *parse_name);
-
+ gboolean (* is_active) (GVfs *vfs);
+ GFile * (* get_file_for_path) (GVfs *vfs,
+ const char *path);
+ GFile * (* get_file_for_uri) (GVfs *vfs,
+ const char *uri);
+ const gchar * const * (* get_supported_uri_schemes) (GVfs *vfs);
+ GFile * (* parse_name) (GVfs *vfs,
+ const char *parse_name);
/*< private >*/
/* Padding for future expansion */
@@ -87,20 +87,19 @@
void (*_g_reserved10) (void);
void (*_g_reserved11) (void);
void (*_g_reserved12) (void);
-
};
-GType g_vfs_get_type (void) G_GNUC_CONST;
+GType g_vfs_get_type (void) G_GNUC_CONST;
gboolean g_vfs_is_active (GVfs *vfs);
GFile * g_vfs_get_file_for_path (GVfs *vfs,
- const char *path);
+ const char *path);
GFile * g_vfs_get_file_for_uri (GVfs *vfs,
- const char *uri);
-const gchar* const * g_vfs_get_supported_uri_schemes (GVfs *vfs);
+ const char *uri);
+const gchar* const * g_vfs_get_supported_uri_schemes (GVfs *vfs);
GFile * g_vfs_parse_name (GVfs *vfs,
- const char *parse_name);
+ const char *parse_name);
GVfs * g_vfs_get_default (void);
GVfs * g_vfs_get_local (void);
Modified: trunk/gio/gvolume.h
==============================================================================
--- trunk/gio/gvolume.h (original)
+++ trunk/gio/gvolume.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
@@ -89,14 +89,14 @@
* @mount_finish: Finishes a mount operation.
* @eject: Ejects a given #GVolume.
* @eject_finish: Finishes an eject operation.
- * @get_identifier: Returns the <link linkend="volume-identifier">identifier</link> of the given kind, or %NULL if
+ * @get_identifier: Returns the <link linkend="volume-identifier">identifier</link> of the given kind, or %NULL if
* the #GVolume doesn't have one.
* @enumerate_identifiers: Returns an array strings listing the kinds
* of <link linkend="volume-identifier">identifiers</link> which the #GVolume has.
* @should_automount: Returns %TRUE if the #GVolume should be automatically mounted.
* @get_activation_root: Returns the activation root for the #GVolume if it is known in advance or %NULL if
* it is not known.
- *
+ *
* Interface for implementing operations for mountable volumes.
**/
typedef struct _GVolumeIface GVolumeIface;
@@ -107,47 +107,47 @@
/* signals */
- void (*changed) (GVolume *volume);
- void (*removed) (GVolume *volume);
-
+ void (* changed) (GVolume *volume);
+ void (* removed) (GVolume *volume);
+
/* Virtual Table */
- char * (*get_name) (GVolume *volume);
- GIcon * (*get_icon) (GVolume *volume);
- char * (*get_uuid) (GVolume *volume);
- GDrive * (*get_drive) (GVolume *volume);
- GMount * (*get_mount) (GVolume *volume);
- gboolean (*can_mount) (GVolume *volume);
- gboolean (*can_eject) (GVolume *volume);
- void (*mount_fn) (GVolume *volume,
- GMountMountFlags flags,
- GMountOperation *mount_operation,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*mount_finish) (GVolume *volume,
- GAsyncResult *result,
- GError **error);
- void (*eject) (GVolume *volume,
- GMountUnmountFlags flags,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
- gboolean (*eject_finish) (GVolume *volume,
- GAsyncResult *result,
- GError **error);
-
- char * (*get_identifier) (GVolume *volume,
- const char *kind);
- char ** (*enumerate_identifiers) (GVolume *volume);
+ char * (* get_name) (GVolume *volume);
+ GIcon * (* get_icon) (GVolume *volume);
+ char * (* get_uuid) (GVolume *volume);
+ GDrive * (* get_drive) (GVolume *volume);
+ GMount * (* get_mount) (GVolume *volume);
+ gboolean (* can_mount) (GVolume *volume);
+ gboolean (* can_eject) (GVolume *volume);
+ void (* mount_fn) (GVolume *volume,
+ GMountMountFlags flags,
+ GMountOperation *mount_operation,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* mount_finish) (GVolume *volume,
+ GAsyncResult *result,
+ GError **error);
+ void (* eject) (GVolume *volume,
+ GMountUnmountFlags flags,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+ gboolean (* eject_finish) (GVolume *volume,
+ GAsyncResult *result,
+ GError **error);
+
+ char * (* get_identifier) (GVolume *volume,
+ const char *kind);
+ char ** (* enumerate_identifiers) (GVolume *volume);
- gboolean (*should_automount) (GVolume *volume);
+ gboolean (* should_automount) (GVolume *volume);
+
+ GFile * (* get_activation_root) (GVolume *volume);
- GFile * (*get_activation_root) (GVolume *volume);
-
};
-GType g_volume_get_type (void) G_GNUC_CONST;
+GType g_volume_get_type (void) G_GNUC_CONST;
char * g_volume_get_name (GVolume *volume);
GIcon * g_volume_get_icon (GVolume *volume);
@@ -180,7 +180,6 @@
GFile * g_volume_get_activation_root (GVolume *volume);
-
G_END_DECLS
#endif /* __G_VOLUME_H__ */
Modified: trunk/gio/gvolumemonitor.h
==============================================================================
--- trunk/gio/gvolumemonitor.h (original)
+++ trunk/gio/gvolumemonitor.h Tue Sep 2 19:05:58 2008
@@ -1,7 +1,7 @@
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
/* 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
@@ -57,63 +57,65 @@
**/
typedef struct _GVolumeMonitorClass GVolumeMonitorClass;
-struct _GVolumeMonitor {
+struct _GVolumeMonitor
+{
GObject parent_instance;
/*< private >*/
gpointer priv;
};
-struct _GVolumeMonitorClass {
+struct _GVolumeMonitorClass
+{
GObjectClass parent_class;
/*< public >*/
/* signals */
- void (* volume_added) (GVolumeMonitor *volume_monitor,
- GVolume *volume);
- void (* volume_removed) (GVolumeMonitor *volume_monitor,
- GVolume *volume);
- void (* volume_changed) (GVolumeMonitor *volume_monitor,
- GVolume *volume);
-
- void (* mount_added) (GVolumeMonitor *volume_monitor,
- GMount *mount);
- void (* mount_removed) (GVolumeMonitor *volume_monitor,
- GMount *mount);
- void (* mount_pre_unmount) (GVolumeMonitor *volume_monitor,
- GMount *mount);
- void (* mount_changed) (GVolumeMonitor *volume_monitor,
- GMount *mount);
-
- void (* drive_connected) (GVolumeMonitor *volume_monitor,
- GDrive *drive);
- void (* drive_disconnected) (GVolumeMonitor *volume_monitor,
- GDrive *drive);
- void (* drive_changed) (GVolumeMonitor *volume_monitor,
- GDrive *drive);
+ void (* volume_added) (GVolumeMonitor *volume_monitor,
+ GVolume *volume);
+ void (* volume_removed) (GVolumeMonitor *volume_monitor,
+ GVolume *volume);
+ void (* volume_changed) (GVolumeMonitor *volume_monitor,
+ GVolume *volume);
+
+ void (* mount_added) (GVolumeMonitor *volume_monitor,
+ GMount *mount);
+ void (* mount_removed) (GVolumeMonitor *volume_monitor,
+ GMount *mount);
+ void (* mount_pre_unmount) (GVolumeMonitor *volume_monitor,
+ GMount *mount);
+ void (* mount_changed) (GVolumeMonitor *volume_monitor,
+ GMount *mount);
+
+ void (* drive_connected) (GVolumeMonitor *volume_monitor,
+ GDrive *drive);
+ void (* drive_disconnected) (GVolumeMonitor *volume_monitor,
+ GDrive *drive);
+ void (* drive_changed) (GVolumeMonitor *volume_monitor,
+ GDrive *drive);
/* Vtable */
- gboolean (*is_supported) (void);
+ gboolean (* is_supported) (void);
- GList * (*get_connected_drives) (GVolumeMonitor *volume_monitor);
- GList * (*get_volumes) (GVolumeMonitor *volume_monitor);
- GList * (*get_mounts) (GVolumeMonitor *volume_monitor);
+ GList * (* get_connected_drives) (GVolumeMonitor *volume_monitor);
+ GList * (* get_volumes) (GVolumeMonitor *volume_monitor);
+ GList * (* get_mounts) (GVolumeMonitor *volume_monitor);
- GVolume * (*get_volume_for_uuid) (GVolumeMonitor *volume_monitor,
- const char *uuid);
+ GVolume * (* get_volume_for_uuid) (GVolumeMonitor *volume_monitor,
+ const char *uuid);
- GMount * (*get_mount_for_uuid) (GVolumeMonitor *volume_monitor,
- const char *uuid);
+ GMount * (* get_mount_for_uuid) (GVolumeMonitor *volume_monitor,
+ const char *uuid);
/* These arguments are unfortunately backwards by mistake (bug #520169) */
- GVolume * (*adopt_orphan_mount) (GMount *mount,
- GVolumeMonitor *volume_monitor);
+ GVolume * (* adopt_orphan_mount) (GMount *mount,
+ GVolumeMonitor *volume_monitor);
/* signal added in 2.17 */
- void (* drive_eject_button) (GVolumeMonitor *volume_monitor,
- GDrive *drive);
+ void (* drive_eject_button) (GVolumeMonitor *volume_monitor,
+ GDrive *drive);
/*< private >*/
/* Padding for future expansion */
@@ -126,18 +128,18 @@
void (*_g_reserved7) (void);
};
-GType g_volume_monitor_get_type (void) G_GNUC_CONST;
+GType g_volume_monitor_get_type (void) G_GNUC_CONST;
-GVolumeMonitor *g_volume_monitor_get (void);
-GList * g_volume_monitor_get_connected_drives (GVolumeMonitor *volume_monitor);
-GList * g_volume_monitor_get_volumes (GVolumeMonitor *volume_monitor);
-GList * g_volume_monitor_get_mounts (GVolumeMonitor *volume_monitor);
-GVolume * g_volume_monitor_get_volume_for_uuid (GVolumeMonitor *volume_monitor,
- const char *uuid);
-GMount * g_volume_monitor_get_mount_for_uuid (GVolumeMonitor *volume_monitor,
- const char *uuid);
+GVolumeMonitor *g_volume_monitor_get (void);
+GList * g_volume_monitor_get_connected_drives (GVolumeMonitor *volume_monitor);
+GList * g_volume_monitor_get_volumes (GVolumeMonitor *volume_monitor);
+GList * g_volume_monitor_get_mounts (GVolumeMonitor *volume_monitor);
+GVolume * g_volume_monitor_get_volume_for_uuid (GVolumeMonitor *volume_monitor,
+ const char *uuid);
+GMount * g_volume_monitor_get_mount_for_uuid (GVolumeMonitor *volume_monitor,
+ const char *uuid);
-GVolume * g_volume_monitor_adopt_orphan_mount (GMount *mount);
+GVolume * g_volume_monitor_adopt_orphan_mount (GMount *mount);
G_END_DECLS
Modified: trunk/gio/gwin32appinfo.h
==============================================================================
--- trunk/gio/gwin32appinfo.h (original)
+++ trunk/gio/gwin32appinfo.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* 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
Modified: trunk/gio/gwin32mount.h
==============================================================================
--- trunk/gio/gwin32mount.h (original)
+++ trunk/gio/gwin32mount.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* GIO - GLib Input, Output and Streaming Library
- *
+ *
* Copyright (C) 2006-2007 Red Hat, Inc.
* Copyright (C) 2008 Hans Breuer
*
@@ -38,18 +38,19 @@
typedef struct _GWin32MountClass GWin32MountClass;
-struct _GWin32MountClass {
- GObjectClass parent_class;
+struct _GWin32MountClass
+{
+ GObjectClass parent_class;
};
-GType _g_win32_mount_get_type (void) G_GNUC_CONST;
+GType _g_win32_mount_get_type (void) G_GNUC_CONST;
-GWin32Mount *_g_win32_mount_new (GVolumeMonitor *volume_monitor,
- const char *path,
- GWin32Volume *volume);
-void _g_win32_mount_unset_volume (GWin32Mount *mount,
- GWin32Volume *volume);
-void _g_win32_mount_unmounted (GWin32Mount *mount);
+GWin32Mount * _g_win32_mount_new (GVolumeMonitor *volume_monitor,
+ const char *path,
+ GWin32Volume *volume);
+void _g_win32_mount_unset_volume (GWin32Mount *mount,
+ GWin32Volume *volume);
+void _g_win32_mount_unmounted (GWin32Mount *mount);
G_END_DECLS
Modified: trunk/gio/gwin32volumemonitor.h
==============================================================================
--- trunk/gio/gwin32volumemonitor.h (original)
+++ trunk/gio/gwin32volumemonitor.h Tue Sep 2 19:05:58 2008
@@ -1,5 +1,5 @@
/* GIO - GLib Input, Output and Streaming Library
- *
+ *
* Copyright (C) 2006-2007 Red Hat, Inc.
* Copyright (C) 2008 Hans Breuer
*
@@ -46,20 +46,20 @@
*
* Implementation of the #GMount interface for Win32 systems.
*/
-typedef struct _GWin32Mount GWin32Mount;
+typedef struct _GWin32Mount GWin32Mount;
typedef struct _GWin32Volume GWin32Volume;
-struct _GWin32VolumeMonitorClass {
+struct _GWin32VolumeMonitorClass
+{
GNativeVolumeMonitorClass parent_class;
-
};
-GType _g_win32_volume_monitor_get_type (void) G_GNUC_CONST;
+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);
+GWin32Volume * _g_win32_volume_monitor_lookup_volume_for_mount_path (GWin32VolumeMonitor *monitor,
+ const char *mount_path);
G_END_DECLS
-#endif
+#endif /* __G_WIN32_VOLUME_MONITOR_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
