luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-31 16:32:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

big header formatting cleanup: indentation, vtable formatting, consistent

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

7
gio/ChangeLog
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> 2008-09-02 Matthias Clasen <mclasen@redhat.com>
* gmount.h: Document guess_content_type sync vfunc. * gmount.h: Document guess_content_type sync vfunc.

3
gio/gappinfo.h
View File

@@ -123,8 +123,6 @@ struct _GAppInfoIface
}; };
GType g_app_info_get_type (void) G_GNUC_CONST; 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, GAppInfo * g_app_info_create_from_commandline (const char *commandline,
const char *application_name, const char *application_name,
GAppInfoCreateFlags flags, GAppInfoCreateFlags flags,
@@ -210,6 +208,7 @@ struct _GAppLaunchContextClass
void (*_g_reserved5) (void); void (*_g_reserved5) (void);
}; };
GType g_app_launch_context_get_type (void) G_GNUC_CONST;
GAppLaunchContext *g_app_launch_context_new (void); GAppLaunchContext *g_app_launch_context_new (void);
char * g_app_launch_context_get_display (GAppLaunchContext *context, char * g_app_launch_context_get_display (GAppLaunchContext *context,
GAppInfo *info, GAppInfo *info,

3
gio/gasynchelper.h
View File

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

1
gio/gbufferedinputstream.h
View File

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

1
gio/gcontenttype.h
View File

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

1
gio/gdatainputstream.h
View File

@@ -59,6 +59,7 @@ struct _GDataInputStream
struct _GDataInputStreamClass struct _GDataInputStreamClass
{ {
GBufferedInputStreamClass parent_class; GBufferedInputStreamClass parent_class;
/*< private >*/ /*< private >*/
/* Padding for future expansion */ /* Padding for future expansion */
void (*_g_reserved1) (void); void (*_g_reserved1) (void);

1
gio/gdataoutputstream.h
View File

@@ -60,6 +60,7 @@ struct _GDataOutputStream
struct _GDataOutputStreamClass struct _GDataOutputStreamClass
{ {
GFilterOutputStreamClass parent_class; GFilterOutputStreamClass parent_class;
/*< private >*/ /*< private >*/
/* Padding for future expansion */ /* Padding for future expansion */
void (*_g_reserved1) (void); void (*_g_reserved1) (void);

2
gio/gdesktopappinfo.h
View File

@@ -85,10 +85,10 @@ struct _GDesktopAppInfoLookupIface
}; };
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, GAppInfo *g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *lookup,
const char *uri_scheme); const char *uri_scheme);
G_END_DECLS G_END_DECLS
#endif /* __G_DESKTOP_APP_INFO_H__ */ #endif /* __G_DESKTOP_APP_INFO_H__ */

1
gio/gdrive.h
View File

@@ -61,7 +61,6 @@ G_BEGIN_DECLS
* @enumerate_identifiers: Returns an array strings listing the kinds * @enumerate_identifiers: Returns an array strings listing the kinds
* of identifiers which the #GDrive has. * of identifiers which the #GDrive has.
* *
*
* Interface for creating #GDrive implementations. * Interface for creating #GDrive implementations.
*/ */
typedef struct _GDriveIface GDriveIface; typedef struct _GDriveIface GDriveIface;

2
gio/gemblem.c
View File

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

2
gio/gemblem.h
View File

@@ -26,10 +26,8 @@
#ifndef __G_EMBLEM_H__ #ifndef __G_EMBLEM_H__
#define __G_EMBLEM_H__ #define __G_EMBLEM_H__
#include <gio/gicon.h>
#include <gio/gioenums.h> #include <gio/gioenums.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define G_TYPE_EMBLEM (g_emblem_get_type ()) #define G_TYPE_EMBLEM (g_emblem_get_type ())

4
gio/gemblemedicon.h
View File

@@ -29,8 +29,7 @@
#define __G_EMBLEMED_ICON_H__ #define __G_EMBLEMED_ICON_H__
#include <gio/gicon.h> #include <gio/gicon.h>
#include <gio/gemblem.h>
#include "gemblem.h"
G_BEGIN_DECLS G_BEGIN_DECLS
@@ -58,7 +57,6 @@ 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); GEmblem *emblem);
G_END_DECLS G_END_DECLS
#endif /* __G_EMBLEMED_ICON_H__ */ #endif /* __G_EMBLEMED_ICON_H__ */

7
gio/gfile.h
View File

@@ -382,11 +382,9 @@ struct _GFileIface
GFileProgressCallback progress_callback, GFileProgressCallback progress_callback,
gpointer progress_callback_data, gpointer progress_callback_data,
GError **error); GError **error);
void (* _move_async) (void); void (* _move_async) (void);
void (* _move_finish) (void); void (* _move_finish) (void);
void (* mount_mountable) (GFile *file, void (* mount_mountable) (GFile *file,
GMountMountFlags flags, GMountMountFlags flags,
GMountOperation *mount_operation, GMountOperation *mount_operation,
@@ -396,6 +394,7 @@ struct _GFileIface
GFile * (* mount_mountable_finish) (GFile *file, GFile * (* mount_mountable_finish) (GFile *file,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
void (* unmount_mountable) (GFile *file, void (* unmount_mountable) (GFile *file,
GMountUnmountFlags flags, GMountUnmountFlags flags,
GCancellable *cancellable, GCancellable *cancellable,
@@ -404,6 +403,7 @@ struct _GFileIface
gboolean (* unmount_mountable_finish) (GFile *file, gboolean (* unmount_mountable_finish) (GFile *file,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
void (* eject_mountable) (GFile *file, void (* eject_mountable) (GFile *file,
GMountUnmountFlags flags, GMountUnmountFlags flags,
GCancellable *cancellable, GCancellable *cancellable,
@@ -413,7 +413,6 @@ struct _GFileIface
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
void (* mount_enclosing_volume) (GFile *location, void (* mount_enclosing_volume) (GFile *location,
GMountMountFlags flags, GMountMountFlags flags,
GMountOperation *mount_operation, GMountOperation *mount_operation,
@@ -428,12 +427,10 @@ struct _GFileIface
GFileMonitorFlags flags, GFileMonitorFlags flags,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
GFileMonitor * (* monitor_file) (GFile *file, GFileMonitor * (* monitor_file) (GFile *file,
GFileMonitorFlags flags, GFileMonitorFlags flags,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
}; };
GType g_file_get_type (void) G_GNUC_CONST; GType g_file_get_type (void) G_GNUC_CONST;

7
gio/gfileattribute.h
View File

@@ -39,7 +39,8 @@ G_BEGIN_DECLS
* *
* Information about a specific attribute. * Information about a specific attribute.
**/ **/
struct _GFileAttributeInfo { struct _GFileAttributeInfo
{
char *name; char *name;
GFileAttributeType type; GFileAttributeType type;
GFileAttributeInfoFlags flags; GFileAttributeInfoFlags flags;
@@ -53,7 +54,8 @@ struct _GFileAttributeInfo {
* Acts as a lightweight registry for possible valid file attributes. * Acts as a lightweight registry for possible valid file attributes.
* The registry stores Key-Value pair formats as #GFileAttributeInfo<!-- -->s. * The registry stores Key-Value pair formats as #GFileAttributeInfo<!-- -->s.
**/ **/
struct _GFileAttributeInfoList { struct _GFileAttributeInfoList
{
GFileAttributeInfo *infos; GFileAttributeInfo *infos;
int n_infos; int n_infos;
}; };
@@ -71,5 +73,4 @@ void g_file_attribute_info_list_add (GFileAttributeInfoL
G_END_DECLS G_END_DECLS
#endif /* __G_FILE_INFO_H__ */ #endif /* __G_FILE_INFO_H__ */

1
gio/gfileenumerator.h
View File

@@ -31,7 +31,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define G_TYPE_FILE_ENUMERATOR (g_file_enumerator_get_type ()) #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(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)) #define G_FILE_ENUMERATOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_FILE_ENUMERATOR, GFileEnumeratorClass))

1
gio/gfileinfo.h
View File

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

2
gio/gfileinputstream.h
View File

@@ -81,6 +81,7 @@ struct _GFileInputStreamClass
GFileInfo * (* query_info_finish) (GFileInputStream *stream, GFileInfo * (* query_info_finish) (GFileInputStream *stream,
GAsyncResult *res, GAsyncResult *res,
GError **error); GError **error);
/*< private >*/ /*< private >*/
/* Padding for future expansion */ /* Padding for future expansion */
void (*_g_reserved1) (void); void (*_g_reserved1) (void);
@@ -106,7 +107,6 @@ GFileInfo *g_file_input_stream_query_info_finish (GFileInputStream *stream,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
G_END_DECLS G_END_DECLS
#endif /* __G_FILE_FILE_INPUT_STREAM_H__ */ #endif /* __G_FILE_FILE_INPUT_STREAM_H__ */

3
gio/gfilenamecompleter.h
View File

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

1
gio/gfilterinputstream.h
View File

@@ -68,6 +68,7 @@ struct _GFilterInputStreamClass
GType g_filter_input_stream_get_type (void) G_GNUC_CONST; 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 G_END_DECLS
#endif /* __G_FILTER_INPUT_STREAM_H__ */ #endif /* __G_FILTER_INPUT_STREAM_H__ */

1
gio/gfilteroutputstream.h
View File

@@ -68,6 +68,7 @@ struct _GFilterOutputStreamClass
GType g_filter_output_stream_get_type (void) G_GNUC_CONST; 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 G_END_DECLS
#endif /* __G_FILTER_OUTPUT_STREAM_H__ */ #endif /* __G_FILTER_OUTPUT_STREAM_H__ */

3
gio/gioerror.h
View File

@@ -32,8 +32,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
GQuark g_io_error_quark (void);
/** /**
* G_IO_ERROR: * G_IO_ERROR:
* *
@@ -42,6 +40,7 @@ GQuark g_io_error_quark (void);
**/ **/
#define G_IO_ERROR g_io_error_quark() #define G_IO_ERROR g_io_error_quark()
GQuark g_io_error_quark (void);
GIOErrorEnum g_io_error_from_errno (gint err_no); GIOErrorEnum g_io_error_from_errno (gint err_no);
G_END_DECLS G_END_DECLS

4
gio/giomodule.h
View File

@@ -49,7 +49,7 @@ typedef struct _GIOModuleClass GIOModuleClass;
GType g_io_module_get_type (void) G_GNUC_CONST; GType g_io_module_get_type (void) G_GNUC_CONST;
GIOModule *g_io_module_new (const gchar *filename); 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_register (const char *name);
GIOExtensionPoint *g_io_extension_point_lookup (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); gint g_io_extension_get_priority (GIOExtension *extension);
GTypeClass* g_io_extension_ref_class (GIOExtension *extension); GTypeClass* g_io_extension_ref_class (GIOExtension *extension);
/* API for the modules to implement */ /* API for the modules to implement */
/** /**
* g_io_module_load: * g_io_module_load:
* @module: a #GIOModule. * @module: a #GIOModule.

1
gio/gioscheduler.h
View File

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

1
gio/giotypes.h
View File

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

1
gio/gloadableicon.h
View File

@@ -77,7 +77,6 @@ struct _GLoadableIconIface
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, GInputStream *g_loadable_icon_load (GLoadableIcon *icon,
int size, int size,
char **type, char **type,

6
gio/glocaldirectorymonitor.h
View File

@@ -43,15 +43,19 @@ typedef struct _GLocalDirectoryMonitorClass GLocalDirectoryMonitorClass;
struct _GLocalDirectoryMonitor struct _GLocalDirectoryMonitor
{ {
GFileMonitor parent_instance; GFileMonitor parent_instance;
gchar *dirname; gchar *dirname;
/* For mount emulation */ /* For mount emulation */
GUnixMountMonitor *mount_monitor; GUnixMountMonitor *mount_monitor;
gboolean was_mounted; gboolean was_mounted;
}; };
struct _GLocalDirectoryMonitorClass { struct _GLocalDirectoryMonitorClass
{
GFileMonitorClass parent_class; GFileMonitorClass parent_class;
gboolean mount_notify; gboolean mount_notify;
gboolean (* is_supported) (void); gboolean (* is_supported) (void);
}; };

2
gio/glocalfileenumerator.h
View File

@@ -39,11 +39,9 @@ typedef struct _GLocalFileEnumerator GLocalFileEnumerator;
typedef struct _GLocalFileEnumeratorClass GLocalFileEnumeratorClass; typedef struct _GLocalFileEnumeratorClass GLocalFileEnumeratorClass;
typedef struct _GLocalFileEnumeratorPrivate GLocalFileEnumeratorPrivate; typedef struct _GLocalFileEnumeratorPrivate GLocalFileEnumeratorPrivate;
struct _GLocalFileEnumeratorClass struct _GLocalFileEnumeratorClass
{ {
GFileEnumeratorClass parent_class; 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;

3
gio/glocalfileinfo.h
View File

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

5
gio/glocalfilemonitor.h
View File

@@ -41,11 +41,14 @@ typedef struct _GLocalFileMonitorClass GLocalFileMonitorClass;
struct _GLocalFileMonitor struct _GLocalFileMonitor
{ {
GFileMonitor parent_instance; GFileMonitor parent_instance;
gchar *filename; gchar *filename;
}; };
struct _GLocalFileMonitorClass { struct _GLocalFileMonitorClass
{
GFileMonitorClass parent_class; GFileMonitorClass parent_class;
gboolean (* is_supported) (void); gboolean (* is_supported) (void);
}; };

1
gio/glocalvfs.h
View File

@@ -41,7 +41,6 @@ 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 G_END_DECLS
#endif /* __G_LOCAL_VFS_H__ */ #endif /* __G_LOCAL_VFS_H__ */

9
gio/gmount.h
View File

@@ -85,6 +85,7 @@ struct _GMountIface
GDrive * (* get_drive) (GMount *mount); GDrive * (* get_drive) (GMount *mount);
gboolean (* can_unmount) (GMount *mount); gboolean (* can_unmount) (GMount *mount);
gboolean (* can_eject) (GMount *mount); gboolean (* can_eject) (GMount *mount);
void (* unmount) (GMount *mount, void (* unmount) (GMount *mount,
GMountUnmountFlags flags, GMountUnmountFlags flags,
GCancellable *cancellable, GCancellable *cancellable,
@@ -93,6 +94,7 @@ struct _GMountIface
gboolean (* unmount_finish) (GMount *mount, gboolean (* unmount_finish) (GMount *mount,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
void (* eject) (GMount *mount, void (* eject) (GMount *mount,
GMountUnmountFlags flags, GMountUnmountFlags flags,
GCancellable *cancellable, GCancellable *cancellable,
@@ -101,6 +103,7 @@ struct _GMountIface
gboolean (* eject_finish) (GMount *mount, gboolean (* eject_finish) (GMount *mount,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
void (* remount) (GMount *mount, void (* remount) (GMount *mount,
GMountMountFlags flags, GMountMountFlags flags,
GMountOperation *mount_operation, GMountOperation *mount_operation,
@@ -116,11 +119,9 @@ struct _GMountIface
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data); gpointer user_data);
gchar ** (* guess_content_type_finish) (GMount *mount, gchar ** (* guess_content_type_finish) (GMount *mount,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
gchar ** (* guess_content_type_sync) (GMount *mount, gchar ** (* guess_content_type_sync) (GMount *mount,
gboolean force_rescan, gboolean force_rescan,
GCancellable *cancellable, GCancellable *cancellable,
@@ -137,6 +138,7 @@ GVolume * g_mount_get_volume (GMount *mount);
GDrive * g_mount_get_drive (GMount *mount); GDrive * g_mount_get_drive (GMount *mount);
gboolean g_mount_can_unmount (GMount *mount); gboolean g_mount_can_unmount (GMount *mount);
gboolean g_mount_can_eject (GMount *mount); gboolean g_mount_can_eject (GMount *mount);
void g_mount_unmount (GMount *mount, void g_mount_unmount (GMount *mount,
GMountUnmountFlags flags, GMountUnmountFlags flags,
GCancellable *cancellable, GCancellable *cancellable,
@@ -145,6 +147,7 @@ void g_mount_unmount (GMount *mount,
gboolean g_mount_unmount_finish (GMount *mount, gboolean g_mount_unmount_finish (GMount *mount,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
void g_mount_eject (GMount *mount, void g_mount_eject (GMount *mount,
GMountUnmountFlags flags, GMountUnmountFlags flags,
GCancellable *cancellable, GCancellable *cancellable,
@@ -153,6 +156,7 @@ void g_mount_eject (GMount *mount,
gboolean g_mount_eject_finish (GMount *mount, gboolean g_mount_eject_finish (GMount *mount,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
void g_mount_remount (GMount *mount, void g_mount_remount (GMount *mount,
GMountMountFlags flags, GMountMountFlags flags,
GMountOperation *mount_operation, GMountOperation *mount_operation,
@@ -171,7 +175,6 @@ void g_mount_guess_content_type (GMount *mount,
gchar ** g_mount_guess_content_type_finish (GMount *mount, gchar ** g_mount_guess_content_type_finish (GMount *mount,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
gchar ** g_mount_guess_content_type_sync (GMount *mount, gchar ** g_mount_guess_content_type_sync (GMount *mount,
gboolean force_rescan, gboolean force_rescan,
GCancellable *cancellable, GCancellable *cancellable,

1
gio/gmountoperation.h
View File

@@ -90,7 +90,6 @@ struct _GMountOperationClass
}; };
GType g_mount_operation_get_type (void) G_GNUC_CONST; GType g_mount_operation_get_type (void) G_GNUC_CONST;
GMountOperation * g_mount_operation_new (void); GMountOperation * g_mount_operation_new (void);
const char * g_mount_operation_get_username (GMountOperation *op); const char * g_mount_operation_get_username (GMountOperation *op);

7
gio/gnativevolumemonitor.h
View File

@@ -16,11 +16,13 @@ G_BEGIN_DECLS
typedef struct _GNativeVolumeMonitor GNativeVolumeMonitor; typedef struct _GNativeVolumeMonitor GNativeVolumeMonitor;
typedef struct _GNativeVolumeMonitorClass GNativeVolumeMonitorClass; typedef struct _GNativeVolumeMonitorClass GNativeVolumeMonitorClass;
struct _GNativeVolumeMonitor { struct _GNativeVolumeMonitor
{
GVolumeMonitor parent_instance; GVolumeMonitor parent_instance;
}; };
struct _GNativeVolumeMonitorClass { struct _GNativeVolumeMonitorClass
{
GVolumeMonitorClass parent_class; GVolumeMonitorClass parent_class;
GMount * (* get_mount_for_mount_path) (const char *mount_path, GMount * (* get_mount_for_mount_path) (const char *mount_path,
@@ -29,7 +31,6 @@ struct _GNativeVolumeMonitorClass {
GType g_native_volume_monitor_get_type (void) G_GNUC_CONST; GType g_native_volume_monitor_get_type (void) G_GNUC_CONST;
G_END_DECLS G_END_DECLS
#endif /* __G_NATIVE_VOLUME_MONITOR_H__ */ #endif /* __G_NATIVE_VOLUME_MONITOR_H__ */

3
gio/gpollfilemonitor.h
View File

@@ -36,7 +36,8 @@ G_BEGIN_DECLS
typedef struct _GPollFileMonitor GPollFileMonitor; typedef struct _GPollFileMonitor GPollFileMonitor;
typedef struct _GPollFileMonitorClass GPollFileMonitorClass; typedef struct _GPollFileMonitorClass GPollFileMonitorClass;
struct _GPollFileMonitorClass { struct _GPollFileMonitorClass
{
GFileMonitorClass parent_class; GFileMonitorClass parent_class;
}; };

3
gio/gunionvolumemonitor.h
View File

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

3
gio/gunixmount.h
View File

@@ -38,7 +38,8 @@ G_BEGIN_DECLS
typedef struct _GUnixMountClass GUnixMountClass; typedef struct _GUnixMountClass GUnixMountClass;
struct _GUnixMountClass { struct _GUnixMountClass
{
GObjectClass parent_class; GObjectClass parent_class;
}; };

3
gio/gunixvolume.h
View File

@@ -38,7 +38,8 @@ G_BEGIN_DECLS
typedef struct _GUnixVolumeClass GUnixVolumeClass; typedef struct _GUnixVolumeClass GUnixVolumeClass;
struct _GUnixVolumeClass { struct _GUnixVolumeClass
{
GObjectClass parent_class; GObjectClass parent_class;
}; };

4
gio/gunixvolumemonitor.h
View File

@@ -47,9 +47,9 @@ typedef struct _GUnixVolumeMonitorClass GUnixVolumeMonitorClass;
typedef struct _GUnixMount GUnixMount; typedef struct _GUnixMount GUnixMount;
typedef struct _GUnixVolume GUnixVolume; typedef struct _GUnixVolume GUnixVolume;
struct _GUnixVolumeMonitorClass { struct _GUnixVolumeMonitorClass
{
GNativeVolumeMonitorClass parent_class; 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;

5
gio/gvfs.h
View File

@@ -53,7 +53,8 @@ G_BEGIN_DECLS
**/ **/
typedef struct _GVfsClass GVfsClass; typedef struct _GVfsClass GVfsClass;
struct _GVfs { struct _GVfs
{
GObject parent_instance; GObject parent_instance;
}; };
@@ -72,7 +73,6 @@ struct _GVfsClass
GFile * (* parse_name) (GVfs *vfs, GFile * (* parse_name) (GVfs *vfs,
const char *parse_name); const char *parse_name);
/*< private >*/ /*< private >*/
/* Padding for future expansion */ /* Padding for future expansion */
void (*_g_reserved1) (void); void (*_g_reserved1) (void);
@@ -87,7 +87,6 @@ struct _GVfsClass
void (*_g_reserved10) (void); void (*_g_reserved10) (void);
void (*_g_reserved11) (void); void (*_g_reserved11) (void);
void (*_g_reserved12) (void); void (*_g_reserved12) (void);
}; };
GType g_vfs_get_type (void) G_GNUC_CONST; GType g_vfs_get_type (void) G_GNUC_CONST;

1
gio/gvolume.h
View File

@@ -180,7 +180,6 @@ char ** g_volume_enumerate_identifiers (GVolume *volume);
GFile * g_volume_get_activation_root (GVolume *volume); GFile * g_volume_get_activation_root (GVolume *volume);
G_END_DECLS G_END_DECLS
#endif /* __G_VOLUME_H__ */ #endif /* __G_VOLUME_H__ */

6
gio/gvolumemonitor.h
View File

@@ -57,14 +57,16 @@ G_BEGIN_DECLS
**/ **/
typedef struct _GVolumeMonitorClass GVolumeMonitorClass; typedef struct _GVolumeMonitorClass GVolumeMonitorClass;
struct _GVolumeMonitor { struct _GVolumeMonitor
{
GObject parent_instance; GObject parent_instance;
/*< private >*/ /*< private >*/
gpointer priv; gpointer priv;
}; };
struct _GVolumeMonitorClass { struct _GVolumeMonitorClass
{
GObjectClass parent_class; GObjectClass parent_class;
/*< public >*/ /*< public >*/

3
gio/gwin32mount.h
View File

@@ -38,7 +38,8 @@ G_BEGIN_DECLS
typedef struct _GWin32MountClass GWin32MountClass; typedef struct _GWin32MountClass GWin32MountClass;
struct _GWin32MountClass { struct _GWin32MountClass
{
GObjectClass parent_class; GObjectClass parent_class;
}; };

6
gio/gwin32volumemonitor.h
View File

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