big header formatting cleanup: indentation, vtable formatting, consistent

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.


svn path=/trunk/; revision=7433
This commit is contained in:
Michael Natterer 2008-09-02 19:05:58 +00:00 committed by Michael Natterer
parent 920f3bffb3
commit f2a2d6c9ac
66 changed files with 1331 additions and 1319 deletions

View File

@ -1,3 +1,10 @@
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.
2008-09-02 Matthias Clasen <mclasen@redhat.com>
* gmount.h: Document guess_content_type sync vfunc.

View File

@ -86,45 +86,43 @@ struct _GAppInfoIface
/* Virtual Table */
GAppInfo * (*dup) (GAppInfo *appinfo);
gboolean (*equal) (GAppInfo *appinfo1,
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,
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,
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);
gboolean (* should_show) (GAppInfo *appinfo);
/* For changing associations */
gboolean (*set_as_default_for_type) (GAppInfo *appinfo,
gboolean (* set_as_default_for_type) (GAppInfo *appinfo,
const char *content_type,
GError **error);
gboolean (*set_as_default_for_extension) (GAppInfo *appinfo,
gboolean (* set_as_default_for_extension) (GAppInfo *appinfo,
const char *extension,
GError **error);
gboolean (*add_supports_type) (GAppInfo *appinfo,
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,
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;
GAppInfo * g_app_info_create_from_commandline (const char *commandline,
const char *application_name,
GAppInfoCreateFlags flags,
@ -193,13 +191,13 @@ struct _GAppLaunchContextClass
{
GObjectClass parent_class;
char * (*get_display) (GAppLaunchContext *context,
char * (* get_display) (GAppLaunchContext *context,
GAppInfo *info,
GList *files);
char * (*get_startup_notify_id) (GAppLaunchContext *context,
char * (* get_startup_notify_id) (GAppLaunchContext *context,
GAppInfo *info,
GList *files);
void (*launch_failed) (GAppLaunchContext *context,
void (* launch_failed) (GAppLaunchContext *context,
const char *startup_notify_id);
/* Padding for future expansion */
@ -210,6 +208,7 @@ struct _GAppLaunchContextClass
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,

View File

@ -27,7 +27,8 @@
G_BEGIN_DECLS
typedef struct {
typedef struct
{
gpointer async_object;
GError * error;
gpointer user_data;

View File

@ -59,8 +59,8 @@ struct _GAsyncResultIface
/* 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;

View File

@ -118,7 +118,6 @@ int g_buffered_input_stream_read_byte (GBufferedInputStream *st
GCancellable *cancellable,
GError **error);
G_END_DECLS
#endif /* __G_BUFFERED_INPUT_STREAM_H__ */

View File

@ -27,7 +27,6 @@
#ifndef __G_CONTENT_TYPE_H__
#define __G_CONTENT_TYPE_H__
#include <glib.h>
#include <gio/giotypes.h>
G_BEGIN_DECLS

View File

@ -59,6 +59,7 @@ struct _GDataInputStream
struct _GDataInputStreamClass
{
GBufferedInputStreamClass parent_class;
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
@ -69,7 +70,7 @@ struct _GDataInputStreamClass
};
GType g_data_input_stream_get_type (void) G_GNUC_CONST;
GDataInputStream* g_data_input_stream_new (GInputStream *base_stream);
GDataInputStream * g_data_input_stream_new (GInputStream *base_stream);
void g_data_input_stream_set_byte_order (GDataInputStream *stream,
GDataStreamByteOrder order);

View File

@ -60,6 +60,7 @@ struct _GDataOutputStream
struct _GDataOutputStreamClass
{
GFilterOutputStreamClass parent_class;
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
@ -71,7 +72,7 @@ struct _GDataOutputStreamClass
GType g_data_output_stream_get_type (void) G_GNUC_CONST;
GDataOutputStream* g_data_output_stream_new (GOutputStream *base_stream);
GDataOutputStream * g_data_output_stream_new (GOutputStream *base_stream);
void g_data_output_stream_set_byte_order (GDataOutputStream *stream,
GDataStreamByteOrder order);

View File

@ -80,15 +80,15 @@ struct _GDesktopAppInfoLookupIface
{
GTypeInterface g_iface;
GAppInfo * (*get_default_for_uri_scheme) (GDesktopAppInfoLookup *lookup,
GAppInfo * (* get_default_for_uri_scheme) (GDesktopAppInfoLookup *lookup,
const char *uri_scheme);
};
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);
G_END_DECLS
#endif /* __G_DESKTOP_APP_INFO_H__ */

View File

@ -61,7 +61,6 @@ G_BEGIN_DECLS
* @enumerate_identifiers: Returns an array strings listing the kinds
* of identifiers which the #GDrive has.
*
*
* Interface for creating #GDrive implementations.
*/
typedef struct _GDriveIface GDriveIface;
@ -71,39 +70,39 @@ struct _GDriveIface
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,
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,
gboolean (* eject_finish) (GDrive *drive,
GAsyncResult *result,
GError **error);
void (*poll_for_media) (GDrive *drive,
void (* poll_for_media) (GDrive *drive,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean (*poll_for_media_finish) (GDrive *drive,
gboolean (* poll_for_media_finish) (GDrive *drive,
GAsyncResult *result,
GError **error);
char * (*get_identifier) (GDrive *drive,
char * (* get_identifier) (GDrive *drive,
const char *kind);
char ** (*enumerate_identifiers) (GDrive *drive);
char ** (* enumerate_identifiers) (GDrive *drive);
};
GType g_drive_get_type (void) G_GNUC_CONST;

View File

@ -19,9 +19,9 @@
*
*/
#include <config.h>
#include "gicon.h"
#include "gemblem.h"
#include "glibintl.h"
#include "gioenums.h"

View File

@ -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 ())

View File

@ -29,8 +29,7 @@
#define __G_EMBLEMED_ICON_H__
#include <gio/gicon.h>
#include "gemblem.h"
#include <gio/gemblem.h>
G_BEGIN_DECLS
@ -58,7 +57,6 @@ GList *g_emblemed_icon_get_emblems (GEmblemedIcon *emblemed);
void g_emblemed_icon_add_emblem (GEmblemedIcon *emblemed,
GEmblem *emblem);
G_END_DECLS
#endif /* __G_EMBLEMED_ICON_H__ */

View File

@ -141,184 +141,184 @@ struct _GFileIface
/* Virtual Table */
GFile * (*dup) (GFile *file);
guint (*hash) (GFile *file);
gboolean (*equal) (GFile *file1,
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,
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,
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,
char * (* get_relative_path) (GFile *parent,
GFile *descendant);
GFile * (*resolve_relative_path) (GFile *file,
GFile * (* resolve_relative_path) (GFile *file,
const char *relative_path);
GFile * (*get_child_for_display_name) (GFile *file,
GFile * (* get_child_for_display_name) (GFile *file,
const char *display_name,
GError **error);
GFileEnumerator * (*enumerate_children) (GFile *file,
GFileEnumerator * (* enumerate_children) (GFile *file,
const char *attributes,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
void (*enumerate_children_async) (GFile *file,
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,
GFileEnumerator * (* enumerate_children_finish) (GFile *file,
GAsyncResult *res,
GError **error);
GFileInfo * (*query_info) (GFile *file,
GFileInfo * (* query_info) (GFile *file,
const char *attributes,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
void (*query_info_async) (GFile *file,
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,
GFileInfo * (* query_info_finish) (GFile *file,
GAsyncResult *res,
GError **error);
GFileInfo * (*query_filesystem_info)(GFile *file,
GFileInfo * (* query_filesystem_info) (GFile *file,
const char *attributes,
GCancellable *cancellable,
GError **error);
void (*query_filesystem_info_async) (GFile *file,
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,
GFileInfo * (* query_filesystem_info_finish)(GFile *file,
GAsyncResult *res,
GError **error);
GMount * (*find_enclosing_mount)(GFile *file,
GMount * (* find_enclosing_mount) (GFile *file,
GCancellable *cancellable,
GError **error);
void (*find_enclosing_mount_async)(GFile *file,
void (* find_enclosing_mount_async) (GFile *file,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GMount * (*find_enclosing_mount_finish)(GFile *file,
GMount * (* find_enclosing_mount_finish) (GFile *file,
GAsyncResult *res,
GError **error);
GFile * (*set_display_name) (GFile *file,
GFile * (* set_display_name) (GFile *file,
const char *display_name,
GCancellable *cancellable,
GError **error);
void (*set_display_name_async) (GFile *file,
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,
GFile * (* set_display_name_finish) (GFile *file,
GAsyncResult *res,
GError **error);
GFileAttributeInfoList * (*query_settable_attributes) (GFile *file,
GFileAttributeInfoList * (* query_settable_attributes) (GFile *file,
GCancellable *cancellable,
GError **error);
void (*_query_settable_attributes_async) (void);
void (*_query_settable_attributes_finish) (void);
void (* _query_settable_attributes_async) (void);
void (* _query_settable_attributes_finish) (void);
GFileAttributeInfoList * (*query_writable_namespaces) (GFile *file,
GFileAttributeInfoList * (* query_writable_namespaces) (GFile *file,
GCancellable *cancellable,
GError **error);
void (*_query_writable_namespaces_async) (void);
void (*_query_writable_namespaces_finish) (void);
void (* _query_writable_namespaces_async) (void);
void (* _query_writable_namespaces_finish) (void);
gboolean (*set_attribute) (GFile *file,
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,
gboolean (* set_attributes_from_info) (GFile *file,
GFileInfo *info,
GFileQueryInfoFlags flags,
GCancellable *cancellable,
GError **error);
void (*set_attributes_async) (GFile *file,
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,
gboolean (* set_attributes_finish) (GFile *file,
GAsyncResult *result,
GFileInfo **info,
GError **error);
GFileInputStream * (*read_fn) (GFile *file,
GFileInputStream * (* read_fn) (GFile *file,
GCancellable *cancellable,
GError **error);
void (*read_async) (GFile *file,
void (* read_async) (GFile *file,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GFileInputStream * (*read_finish) (GFile *file,
GFileInputStream * (* read_finish) (GFile *file,
GAsyncResult *res,
GError **error);
GFileOutputStream * (*append_to) (GFile *file,
GFileOutputStream * (* append_to) (GFile *file,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error);
void (*append_to_async) (GFile *file,
void (* append_to_async) (GFile *file,
GFileCreateFlags flags,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GFileOutputStream * (*append_to_finish) (GFile *file,
GFileOutputStream * (* append_to_finish) (GFile *file,
GAsyncResult *res,
GError **error);
GFileOutputStream * (*create) (GFile *file,
GFileOutputStream * (* create) (GFile *file,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error);
void (*create_async) (GFile *file,
void (* create_async) (GFile *file,
GFileCreateFlags flags,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GFileOutputStream * (*create_finish) (GFile *file,
GFileOutputStream * (* create_finish) (GFile *file,
GAsyncResult *res,
GError **error);
GFileOutputStream * (*replace) (GFile *file,
GFileOutputStream * (* replace) (GFile *file,
const char *etag,
gboolean make_backup,
GFileCreateFlags flags,
GCancellable *cancellable,
GError **error);
void (*replace_async) (GFile *file,
void (* replace_async) (GFile *file,
const char *etag,
gboolean make_backup,
GFileCreateFlags flags,
@ -326,43 +326,43 @@ struct _GFileIface
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GFileOutputStream * (*replace_finish) (GFile *file,
GFileOutputStream * (* replace_finish) (GFile *file,
GAsyncResult *res,
GError **error);
gboolean (*delete_file) (GFile *file,
gboolean (* delete_file) (GFile *file,
GCancellable *cancellable,
GError **error);
void (*_delete_file_async) (void);
void (*_delete_file_finish) (void);
void (* _delete_file_async) (void);
void (* _delete_file_finish) (void);
gboolean (*trash) (GFile *file,
gboolean (* trash) (GFile *file,
GCancellable *cancellable,
GError **error);
void (*_trash_async) (void);
void (*_trash_finish) (void);
void (* _trash_async) (void);
void (* _trash_finish) (void);
gboolean (*make_directory) (GFile *file,
gboolean (* make_directory) (GFile *file,
GCancellable *cancellable,
GError **error);
void (*_make_directory_async) (void);
void (*_make_directory_finish) (void);
void (* _make_directory_async) (void);
void (* _make_directory_finish) (void);
gboolean (*make_symbolic_link) (GFile *file,
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);
void (* _make_symbolic_link_async) (void);
void (* _make_symbolic_link_finish) (void);
gboolean (*copy) (GFile *source,
gboolean (* copy) (GFile *source,
GFile *destination,
GFileCopyFlags flags,
GCancellable *cancellable,
GFileProgressCallback progress_callback,
gpointer progress_callback_data,
GError **error);
void (*copy_async) (GFile *source,
void (* copy_async) (GFile *source,
GFile *destination,
GFileCopyFlags flags,
int io_priority,
@ -371,69 +371,66 @@ struct _GFileIface
gpointer progress_callback_data,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean (*copy_finish) (GFile *file,
gboolean (* copy_finish) (GFile *file,
GAsyncResult *res,
GError **error);
gboolean (*move) (GFile *source,
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 (*_move_async) (void);
void (*_move_finish) (void);
void (*mount_mountable) (GFile *file,
void (* mount_mountable) (GFile *file,
GMountMountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GFile * (*mount_mountable_finish) (GFile *file,
GFile * (* mount_mountable_finish) (GFile *file,
GAsyncResult *result,
GError **error);
void (*unmount_mountable) (GFile *file,
void (* unmount_mountable) (GFile *file,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean (*unmount_mountable_finish) (GFile *file,
gboolean (* unmount_mountable_finish) (GFile *file,
GAsyncResult *result,
GError **error);
void (*eject_mountable) (GFile *file,
void (* eject_mountable) (GFile *file,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean (*eject_mountable_finish) (GFile *file,
gboolean (* eject_mountable_finish) (GFile *file,
GAsyncResult *result,
GError **error);
void (*mount_enclosing_volume) (GFile *location,
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,
gboolean (* mount_enclosing_volume_finish) (GFile *location,
GAsyncResult *result,
GError **error);
GFileMonitor* (*monitor_dir) (GFile *file,
GFileMonitor * (* monitor_dir) (GFile *file,
GFileMonitorFlags flags,
GCancellable *cancellable,
GError **error);
GFileMonitor* (*monitor_file) (GFile *file,
GFileMonitor * (* monitor_file) (GFile *file,
GFileMonitorFlags flags,
GCancellable *cancellable,
GError **error);
};
GType g_file_get_type (void) G_GNUC_CONST;

View File

@ -39,7 +39,8 @@ G_BEGIN_DECLS
*
* Information about a specific attribute.
**/
struct _GFileAttributeInfo {
struct _GFileAttributeInfo
{
char *name;
GFileAttributeType type;
GFileAttributeInfoFlags flags;
@ -53,7 +54,8 @@ struct _GFileAttributeInfo {
* 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;
};
@ -71,5 +73,4 @@ void g_file_attribute_info_list_add (GFileAttributeInfoL
G_END_DECLS
#endif /* __G_FILE_INFO_H__ */

View File

@ -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))
@ -62,28 +61,28 @@ struct _GFileEnumeratorClass
/* Virtual Table */
GFileInfo *(*next_file) (GFileEnumerator *enumerator,
GFileInfo * (* next_file) (GFileEnumerator *enumerator,
GCancellable *cancellable,
GError **error);
gboolean (*close_fn) (GFileEnumerator *enumerator,
gboolean (* close_fn) (GFileEnumerator *enumerator,
GCancellable *cancellable,
GError **error);
void (*next_files_async) (GFileEnumerator *enumerator,
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,
GList * (* next_files_finish) (GFileEnumerator *enumerator,
GAsyncResult *res,
GError **error);
void (*close_async) (GFileEnumerator *enumerator,
void (* close_async) (GFileEnumerator *enumerator,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean (*close_finish) (GFileEnumerator *enumerator,
gboolean (* close_finish) (GFileEnumerator *enumerator,
GAsyncResult *res,
GError **error);

View File

@ -47,9 +47,9 @@ typedef struct _GFileIconClass GFileIconClass;
GType g_file_icon_get_type (void) G_GNUC_CONST;
GIcon *g_file_icon_new (GFile *file);
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

View File

@ -814,5 +814,4 @@ const char * g_file_attribute_matcher_enumerate_next (GFileAttributeMa
G_END_DECLS
#endif /* __G_FILE_INFO_H__ */

View File

@ -61,26 +61,27 @@ struct _GFileInputStreamClass
{
GInputStreamClass parent_class;
goffset (*tell) (GFileInputStream *stream);
gboolean (*can_seek) (GFileInputStream *stream);
gboolean (*seek) (GFileInputStream *stream,
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,
GFileInfo * (* query_info) (GFileInputStream *stream,
char *attributes,
GCancellable *cancellable,
GError **error);
void (*query_info_async) (GFileInputStream *stream,
void (* query_info_async) (GFileInputStream *stream,
char *attributes,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GFileInfo *(*query_info_finish) (GFileInputStream *stream,
GFileInfo * (* query_info_finish) (GFileInputStream *stream,
GAsyncResult *res,
GError **error);
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
@ -106,7 +107,6 @@ GFileInfo *g_file_input_stream_query_info_finish (GFileInputStream *stream,
GAsyncResult *result,
GError **error);
G_END_DECLS
#endif /* __G_FILE_FILE_INPUT_STREAM_H__ */

View File

@ -59,13 +59,13 @@ struct _GFileMonitorClass
GObjectClass parent_class;
/* Signals */
void (* changed) (GFileMonitor* monitor,
GFile* file,
GFile* other_file,
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 */

View File

@ -45,7 +45,8 @@ G_BEGIN_DECLS
**/
typedef struct _GFilenameCompleterClass GFilenameCompleterClass;
struct _GFilenameCompleterClass {
struct _GFilenameCompleterClass
{
GObjectClass parent_class;
/*< public >*/

View File

@ -61,32 +61,32 @@ struct _GFileOutputStreamClass
{
GOutputStreamClass parent_class;
goffset (*tell) (GFileOutputStream *stream);
gboolean (*can_seek) (GFileOutputStream *stream);
gboolean (*seek) (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,
gboolean (* can_truncate) (GFileOutputStream *stream);
gboolean (* truncate_fn) (GFileOutputStream *stream,
goffset size,
GCancellable *cancellable,
GError **error);
GFileInfo *(*query_info) (GFileOutputStream *stream,
GFileInfo * (* query_info) (GFileOutputStream *stream,
char *attributes,
GCancellable *cancellable,
GError **error);
void (*query_info_async) (GFileOutputStream *stream,
void (* query_info_async) (GFileOutputStream *stream,
char *attributes,
int io_priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GFileInfo *(*query_info_finish) (GFileOutputStream *stream,
GFileInfo * (* query_info_finish) (GFileOutputStream *stream,
GAsyncResult *res,
GError **error);
char *(*get_etag) (GFileOutputStream *stream);
char * (* get_etag) (GFileOutputStream *stream);
/* Padding for future expansion */
void (*_g_reserved1) (void);

View File

@ -67,7 +67,8 @@ struct _GFilterInputStreamClass
GType g_filter_input_stream_get_type (void) G_GNUC_CONST;
GInputStream *g_filter_input_stream_get_base_stream (GFilterInputStream *stream);
GInputStream * g_filter_input_stream_get_base_stream (GFilterInputStream *stream);
G_END_DECLS
#endif /* __G_FILTER_INPUT_STREAM_H__ */

View File

@ -67,7 +67,8 @@ struct _GFilterOutputStreamClass
GType g_filter_output_stream_get_type (void) G_GNUC_CONST;
GOutputStream *g_filter_output_stream_get_base_stream (GFilterOutputStream *stream);
GOutputStream * g_filter_output_stream_get_base_stream (GFilterOutputStream *stream);
G_END_DECLS
#endif /* __G_FILTER_OUTPUT_STREAM_H__ */

View File

@ -59,8 +59,8 @@ struct _GIconIface
/* Virtual Table */
guint (*hash) (GIcon *icon);
gboolean (*equal) (GIcon *icon1,
guint (* hash) (GIcon *icon);
gboolean (* equal) (GIcon *icon1,
GIcon *icon2);
};

View File

@ -98,7 +98,7 @@ struct _GInputStreamClass
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean (* close_finish)(GInputStream *stream,
gboolean (* close_finish) (GInputStream *stream,
GAsyncResult *result,
GError **error);

View File

@ -32,8 +32,6 @@
G_BEGIN_DECLS
GQuark g_io_error_quark (void);
/**
* G_IO_ERROR:
*
@ -42,6 +40,7 @@ GQuark g_io_error_quark (void);
**/
#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

View File

@ -49,7 +49,7 @@ typedef struct _GIOModuleClass GIOModuleClass;
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);
@ -69,7 +69,9 @@ 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.

View File

@ -27,7 +27,6 @@
#ifndef __G_IO_SCHEDULER_H__
#define __G_IO_SCHEDULER_H__
#include <glib.h>
#include <gio/giotypes.h>
G_BEGIN_DECLS

View File

@ -27,7 +27,6 @@
#ifndef __GIO_TYPES_H__
#define __GIO_TYPES_H__
#include <glib-object.h>
#include <gio/gioenums.h>
G_BEGIN_DECLS

View File

@ -59,17 +59,17 @@ struct _GLoadableIconIface
/* Virtual Table */
GInputStream * (*load) (GLoadableIcon *icon,
GInputStream * (* load) (GLoadableIcon *icon,
int size,
char **type,
GCancellable *cancellable,
GError **error);
void (*load_async) (GLoadableIcon *icon,
void (* load_async) (GLoadableIcon *icon,
int size,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
GInputStream * (*load_finish) (GLoadableIcon *icon,
GInputStream * (* load_finish) (GLoadableIcon *icon,
GAsyncResult *res,
char **type,
GError **error);
@ -77,7 +77,6 @@ struct _GLoadableIconIface
GType g_loadable_icon_get_type (void) G_GNUC_CONST;
GInputStream *g_loadable_icon_load (GLoadableIcon *icon,
int size,
char **type,

View File

@ -43,21 +43,25 @@ typedef struct _GLocalDirectoryMonitorClass GLocalDirectoryMonitorClass;
struct _GLocalDirectoryMonitor
{
GFileMonitor parent_instance;
gchar *dirname;
/* For mount emulation */
GUnixMountMonitor *mount_monitor;
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;
GFileMonitor* _g_local_directory_monitor_new (const char *dirname,
GFileMonitor * _g_local_directory_monitor_new (const char *dirname,
GFileMonitorFlags flags,
GError **error);

View File

@ -39,16 +39,14 @@ typedef struct _GLocalFileEnumerator GLocalFileEnumerator;
typedef struct _GLocalFileEnumeratorClass GLocalFileEnumeratorClass;
typedef struct _GLocalFileEnumeratorPrivate GLocalFileEnumeratorPrivate;
struct _GLocalFileEnumeratorClass
{
GFileEnumeratorClass parent_class;
};
GType _g_local_file_enumerator_get_type (void) G_GNUC_CONST;
GFileEnumerator *_g_local_file_enumerator_new (GLocalFile *file,
GFileEnumerator * _g_local_file_enumerator_new (GLocalFile *file,
const char *attributes,
GFileQueryInfoFlags flags,
GCancellable *cancellable,

View File

@ -32,7 +32,8 @@
G_BEGIN_DECLS
typedef struct {
typedef struct
{
gboolean writable;
gboolean is_sticky;
gboolean has_trash_dir;

View File

@ -53,7 +53,7 @@ struct _GLocalFileInputStreamClass
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

View File

@ -41,17 +41,20 @@ typedef struct _GLocalFileMonitorClass GLocalFileMonitorClass;
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;
GFileMonitor* _g_local_file_monitor_new (const char *pathname,
GFileMonitor * _g_local_file_monitor_new (const char *pathname,
GFileMonitorFlags flags,
GError **error);

View File

@ -52,15 +52,15 @@ struct _GLocalFileOutputStreamClass
};
GType _g_local_file_output_stream_get_type (void) G_GNUC_CONST;
GFileOutputStream *_g_local_file_output_stream_create (const char *filename,
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,
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,
GFileOutputStream * _g_local_file_output_stream_replace (const char *filename,
const char *etag,
gboolean create_backup,
GFileCreateFlags flags,

View File

@ -39,8 +39,7 @@ 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

View File

@ -79,7 +79,7 @@ struct _GMemoryOutputStreamClass
*
* Returns: a pointer to the reallocated memory
*/
typedef gpointer (*GReallocFunc) (gpointer data,
typedef gpointer (* GReallocFunc) (gpointer data,
gsize size);
GType g_memory_output_stream_get_type (void) G_GNUC_CONST;

View File

@ -72,56 +72,57 @@ struct _GMountIface
/* 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,
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,
gboolean (* unmount_finish) (GMount *mount,
GAsyncResult *result,
GError **error);
void (*eject) (GMount *mount,
void (* eject) (GMount *mount,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean (*eject_finish) (GMount *mount,
gboolean (* eject_finish) (GMount *mount,
GAsyncResult *result,
GError **error);
void (*remount) (GMount *mount,
void (* remount) (GMount *mount,
GMountMountFlags flags,
GMountOperation *mount_operation,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean (*remount_finish) (GMount *mount,
gboolean (* remount_finish) (GMount *mount,
GAsyncResult *result,
GError **error);
void (*guess_content_type) (GMount *mount,
void (* guess_content_type) (GMount *mount,
gboolean force_rescan,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gchar ** (*guess_content_type_finish) (GMount *mount,
gchar ** (* guess_content_type_finish) (GMount *mount,
GAsyncResult *result,
GError **error);
gchar ** (*guess_content_type_sync) (GMount *mount,
gchar ** (* guess_content_type_sync) (GMount *mount,
gboolean force_rescan,
GCancellable *cancellable,
GError **error);
@ -137,6 +138,7 @@ 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,
@ -145,6 +147,7 @@ void g_mount_unmount (GMount *mount,
gboolean g_mount_unmount_finish (GMount *mount,
GAsyncResult *result,
GError **error);
void g_mount_eject (GMount *mount,
GMountUnmountFlags flags,
GCancellable *cancellable,
@ -153,6 +156,7 @@ void g_mount_eject (GMount *mount,
gboolean g_mount_eject_finish (GMount *mount,
GAsyncResult *result,
GError **error);
void g_mount_remount (GMount *mount,
GMountMountFlags flags,
GMountOperation *mount_operation,
@ -171,7 +175,6 @@ void g_mount_guess_content_type (GMount *mount,
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,

View File

@ -90,7 +90,6 @@ struct _GMountOperationClass
};
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);

View File

@ -16,20 +16,21 @@ G_BEGIN_DECLS
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,
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__ */

View File

@ -65,7 +65,7 @@ struct _GOutputStreamClass
/* Sync ops: */
gssize (* write_fn)(GOutputStream *stream,
gssize (* write_fn) (GOutputStream *stream,
const void *buffer,
gsize count,
GCancellable *cancellable,
@ -78,7 +78,7 @@ struct _GOutputStreamClass
gboolean (* flush) (GOutputStream *stream,
GCancellable *cancellable,
GError **error);
gboolean (* close_fn)(GOutputStream *stream,
gboolean (* close_fn) (GOutputStream *stream,
GCancellable *cancellable,
GError **error);
@ -101,7 +101,7 @@ struct _GOutputStreamClass
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer data);
gssize (* splice_finish)(GOutputStream *stream,
gssize (* splice_finish) (GOutputStream *stream,
GAsyncResult *result,
GError **error);
void (* flush_async) (GOutputStream *stream,

View File

@ -36,13 +36,14 @@ G_BEGIN_DECLS
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;
GFileMonitor* _g_poll_file_monitor_new (GFile *file);
GFileMonitor * _g_poll_file_monitor_new (GFile *file);
G_END_DECLS

View File

@ -37,7 +37,8 @@ G_BEGIN_DECLS
typedef struct _GUnionVolumeMonitor GUnionVolumeMonitor;
typedef struct _GUnionVolumeMonitorClass GUnionVolumeMonitorClass;
struct _GUnionVolumeMonitorClass {
struct _GUnionVolumeMonitorClass
{
GVolumeMonitorClass parent_class;
};

View File

@ -66,7 +66,7 @@ struct _GUnixInputStreamClass
GType g_unix_input_stream_get_type (void) G_GNUC_CONST;
GInputStream *g_unix_input_stream_new (int fd,
GInputStream * g_unix_input_stream_new (int fd,
gboolean close_fd_at_close);
G_END_DECLS

View File

@ -38,13 +38,14 @@ G_BEGIN_DECLS
typedef struct _GUnixMountClass GUnixMountClass;
struct _GUnixMountClass {
struct _GUnixMountClass
{
GObjectClass parent_class;
};
GType _g_unix_mount_get_type (void) G_GNUC_CONST;
GUnixMount *_g_unix_mount_new (GVolumeMonitor *volume_monitor,
GUnixMount * _g_unix_mount_new (GVolumeMonitor *volume_monitor,
GUnixMountEntry *mount_entry,
GUnixVolume *volume);
gboolean _g_unix_mount_has_mount_path (GUnixMount *mount,

View File

@ -66,7 +66,7 @@ struct _GUnixOutputStreamClass
GType g_unix_output_stream_get_type (void) G_GNUC_CONST;
GOutputStream *g_unix_output_stream_new (int fd,
GOutputStream * g_unix_output_stream_new (int fd,
gboolean close_fd_at_close);
G_END_DECLS

View File

@ -38,13 +38,14 @@ G_BEGIN_DECLS
typedef struct _GUnixVolumeClass GUnixVolumeClass;
struct _GUnixVolumeClass {
struct _GUnixVolumeClass
{
GObjectClass parent_class;
};
GType _g_unix_volume_get_type (void) G_GNUC_CONST;
GUnixVolume *_g_unix_volume_new (GVolumeMonitor *volume_monitor,
GUnixVolume * _g_unix_volume_new (GVolumeMonitor *volume_monitor,
GUnixMountPoint *mountpoint);
gboolean _g_unix_volume_has_mount_path (GUnixVolume *volume,
const char *mount_path);

View File

@ -47,9 +47,9 @@ typedef struct _GUnixVolumeMonitorClass GUnixVolumeMonitorClass;
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;

View File

@ -53,7 +53,8 @@ G_BEGIN_DECLS
**/
typedef struct _GVfsClass GVfsClass;
struct _GVfs {
struct _GVfs
{
GObject parent_instance;
};
@ -63,16 +64,15 @@ struct _GVfsClass
/* Virtual Table */
gboolean (*is_active) (GVfs *vfs);
GFile *(*get_file_for_path) (GVfs *vfs,
gboolean (* is_active) (GVfs *vfs);
GFile * (* get_file_for_path) (GVfs *vfs,
const char *path);
GFile *(*get_file_for_uri) (GVfs *vfs,
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 gchar * const * (* get_supported_uri_schemes) (GVfs *vfs);
GFile * (* parse_name) (GVfs *vfs,
const char *parse_name);
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
@ -87,7 +87,6 @@ struct _GVfsClass
void (*_g_reserved10) (void);
void (*_g_reserved11) (void);
void (*_g_reserved12) (void);
};
GType g_vfs_get_type (void) G_GNUC_CONST;

View File

@ -107,43 +107,43 @@ struct _GVolumeIface
/* 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,
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,
gboolean (* mount_finish) (GVolume *volume,
GAsyncResult *result,
GError **error);
void (*eject) (GVolume *volume,
void (* eject) (GVolume *volume,
GMountUnmountFlags flags,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
gboolean (*eject_finish) (GVolume *volume,
gboolean (* eject_finish) (GVolume *volume,
GAsyncResult *result,
GError **error);
char * (*get_identifier) (GVolume *volume,
char * (* get_identifier) (GVolume *volume,
const char *kind);
char ** (*enumerate_identifiers) (GVolume *volume);
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);
};
@ -180,7 +180,6 @@ char ** g_volume_enumerate_identifiers (GVolume *volume);
GFile * g_volume_get_activation_root (GVolume *volume);
G_END_DECLS
#endif /* __G_VOLUME_H__ */

View File

@ -57,14 +57,16 @@ G_BEGIN_DECLS
**/
typedef struct _GVolumeMonitorClass GVolumeMonitorClass;
struct _GVolumeMonitor {
struct _GVolumeMonitor
{
GObject parent_instance;
/*< private >*/
gpointer priv;
};
struct _GVolumeMonitorClass {
struct _GVolumeMonitorClass
{
GObjectClass parent_class;
/*< public >*/
@ -94,21 +96,21 @@ struct _GVolumeMonitorClass {
/* 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,
GVolume * (* get_volume_for_uuid) (GVolumeMonitor *volume_monitor,
const char *uuid);
GMount * (*get_mount_for_uuid) (GVolumeMonitor *volume_monitor,
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,
GVolume * (* adopt_orphan_mount) (GMount *mount,
GVolumeMonitor *volume_monitor);
/* signal added in 2.17 */

View File

@ -38,13 +38,14 @@ G_BEGIN_DECLS
typedef struct _GWin32MountClass GWin32MountClass;
struct _GWin32MountClass {
struct _GWin32MountClass
{
GObjectClass parent_class;
};
GType _g_win32_mount_get_type (void) G_GNUC_CONST;
GWin32Mount *_g_win32_mount_new (GVolumeMonitor *volume_monitor,
GWin32Mount * _g_win32_mount_new (GVolumeMonitor *volume_monitor,
const char *path,
GWin32Volume *volume);
void _g_win32_mount_unset_volume (GWin32Mount *mount,

View File

@ -49,9 +49,9 @@ typedef struct _GWin32VolumeMonitorClass GWin32VolumeMonitorClass;
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;
@ -62,4 +62,4 @@ GWin32Volume * _g_win32_volume_monitor_lookup_volume_for_mount_path (GWin32Vo
G_END_DECLS
#endif
#endif /* __G_WIN32_VOLUME_MONITOR_H__ */