adium-1.4 3348:2e9c32fda335: Bring glib up to version 2.20.5, sa...
commits at adium.im
commits at adium.im
Mon Feb 14 21:41:25 UTC 2011
details: http://hg.adium.im/adium-1.4/rev/2e9c32fda335
revision: 3348:2e9c32fda335
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Mon Feb 14 22:40:55 2011 +0100
Bring glib up to version 2.20.5, same as trunk.
Fixes #13351
diffs (truncated from 16225 to 1000 lines):
diff -r 4df41210333f -r 2e9c32fda335 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sun Feb 13 19:57:34 2011 +0100
+++ b/Adium.xcodeproj/project.pbxproj Mon Feb 14 22:40:55 2011 +0100
@@ -9574,7 +9574,6 @@
};
buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
compatibilityVersion = "Xcode 3.1";
- developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
en,
diff -r 4df41210333f -r 2e9c32fda335 Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gappinfo.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gappinfo.h Sun Feb 13 19:57:34 2011 +0100
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gappinfo.h Mon Feb 14 22:40:55 2011 +0100
@@ -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,8 +27,7 @@
#ifndef __G_APP_INFO_H__
#define __G_APP_INFO_H__
-#include <glib-object.h>
-#include <gio/gicon.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -44,31 +43,15 @@
#define G_IS_APP_LAUNCH_CONTEXT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_APP_LAUNCH_CONTEXT))
#define G_APP_LAUNCH_CONTEXT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_APP_LAUNCH_CONTEXT, GAppLaunchContextClass))
-/**
- * GAppInfoCreateFlags:
- * @G_APP_INFO_CREATE_NONE: No flags.
- * @G_APP_INFO_CREATE_NEEDS_TERMINAL: Application opens in a terminal window.
- * @G_APP_INFO_CREATE_SUPPORTS_URIS: Application supports URI arguments.
- *
- * Flags used when creating a #GAppInfo.
- */
-typedef enum {
- G_APP_INFO_CREATE_NONE = 0, /*< nick=none >*/
- G_APP_INFO_CREATE_NEEDS_TERMINAL = (1<<0), /*< nick=needs-terminal >*/
- G_APP_INFO_CREATE_SUPPORTS_URIS = (1<<1) /*< nick=supports-uris >*/
-} GAppInfoCreateFlags;
-
-typedef struct _GAppLaunchContext GAppLaunchContext;
typedef struct _GAppLaunchContextClass GAppLaunchContextClass;
typedef struct _GAppLaunchContextPrivate GAppLaunchContextPrivate;
/**
* GAppInfo:
- *
+ *
* Information about an installed application and methods to launch
* it (with file arguments).
*/
-typedef struct _GAppInfo GAppInfo; /* Dummy typedef */
/**
* GAppInfoIface:
@@ -92,7 +75,10 @@
* @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.
- *
+ * @can_delete: Checks if a #GAppInfo can be deleted. Since 2.20
+ * @do_delete: Deletes a #GAppInfo. Since 2.20
+ * @get_commandline: Gets the commandline for the #GAppInfo. Since 2.20
+ *
* Application Information interface, for operating system portability.
*/
typedef struct _GAppInfoIface GAppInfoIface;
@@ -103,45 +89,46 @@
/* 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);
+ gboolean (* can_delete) (GAppInfo *appinfo);
+ gboolean (* do_delete) (GAppInfo *appinfo);
+ const char * (* get_commandline) (GAppInfo *appinfo);
};
-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,
@@ -153,6 +140,7 @@
const char *g_app_info_get_name (GAppInfo *appinfo);
const char *g_app_info_get_description (GAppInfo *appinfo);
const char *g_app_info_get_executable (GAppInfo *appinfo);
+const char *g_app_info_get_commandline (GAppInfo *appinfo);
GIcon * g_app_info_get_icon (GAppInfo *appinfo);
gboolean g_app_info_launch (GAppInfo *appinfo,
GList *files,
@@ -179,9 +167,12 @@
gboolean g_app_info_remove_supports_type (GAppInfo *appinfo,
const char *content_type,
GError **error);
+gboolean g_app_info_can_delete (GAppInfo *appinfo);
+gboolean g_app_info_delete (GAppInfo *appinfo);
GList * g_app_info_get_all (void);
GList * g_app_info_get_all_for_type (const char *content_type);
+void g_app_info_reset_type_associations (const char *content_type);
GAppInfo *g_app_info_get_default_for_type (const char *content_type,
gboolean must_support_uris);
GAppInfo *g_app_info_get_default_for_uri_scheme (const char *uri_scheme);
@@ -193,7 +184,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.
@@ -210,14 +201,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);
@@ -227,6 +218,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,
diff -r 4df41210333f -r 2e9c32fda335 Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gasyncresult.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gasyncresult.h Sun Feb 13 19:57:34 2011 +0100
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gasyncresult.h Mon Feb 14 22:40:55 2011 +0100
@@ -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,7 @@
#ifndef __G_ASYNC_RESULT_H__
#define __G_ASYNC_RESULT_H__
-#include <glib-object.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -39,28 +39,15 @@
/**
* 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 _GAsyncResult GAsyncResult; /* Dummy typedef */
typedef struct _GAsyncResultIface GAsyncResultIface;
-/**
- * GAsyncReadyCallback:
- * @source_object: the object the asynchronous operation was started with.
- * @res: a #GAsyncResult.
- * @user_data: user data passed to the callback.
- *
- * Type definition for a function that will be called back when an asynchronous
- * operation within GIO has been completed.
- **/
-typedef void (*GAsyncReadyCallback) (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data);
/**
* GAsyncResultIface:
- * @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.
*
@@ -72,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);
diff -r 4df41210333f -r 2e9c32fda335 Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gbufferedinputstream.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gbufferedinputstream.h Sun Feb 13 19:57:34 2011 +0100
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gbufferedinputstream.h Mon Feb 14 22:40:55 2011 +0100
@@ -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 at gnome.org>
+ * Author: Christian Kellner <gicmo at gnome.org>
*/
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
@@ -27,7 +27,6 @@
#ifndef __G_BUFFERED_INPUT_STREAM_H__
#define __G_BUFFERED_INPUT_STREAM_H__
-#include <glib-object.h>
#include <gio/gfilterinputstream.h>
G_BEGIN_DECLS
@@ -41,10 +40,9 @@
/**
* GBufferedInputStream:
- *
+ *
* Implements #GFilterInputStream with a sized input buffer.
**/
-typedef struct _GBufferedInputStream GBufferedInputStream;
typedef struct _GBufferedInputStreamClass GBufferedInputStreamClass;
typedef struct _GBufferedInputStreamPrivate GBufferedInputStreamPrivate;
@@ -58,7 +56,7 @@
struct _GBufferedInputStreamClass
{
- GFilterInputStreamClass parent_class;
+ GFilterInputStreamClass parent_class;
gssize (* fill) (GBufferedInputStream *stream,
gssize count,
@@ -120,7 +118,6 @@
GCancellable *cancellable,
GError **error);
-
G_END_DECLS
#endif /* __G_BUFFERED_INPUT_STREAM_H__ */
diff -r 4df41210333f -r 2e9c32fda335 Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gbufferedoutputstream.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gbufferedoutputstream.h Sun Feb 13 19:57:34 2011 +0100
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gbufferedoutputstream.h Mon Feb 14 22:40:55 2011 +0100
@@ -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 at gnome.org>
+ * Author: Christian Kellner <gicmo at gnome.org>
*/
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
@@ -27,7 +27,6 @@
#ifndef __G_BUFFERED_OUTPUT_STREAM_H__
#define __G_BUFFERED_OUTPUT_STREAM_H__
-#include <glib-object.h>
#include <gio/gfilteroutputstream.h>
G_BEGIN_DECLS
@@ -42,10 +41,9 @@
/**
* GBufferedOutputStream:
* @parent_class: The parent class.
- *
+ *
* An implementation of #GFilterOutputStream with a sized buffer.
**/
-typedef struct _GBufferedOutputStream GBufferedOutputStream;
typedef struct _GBufferedOutputStreamClass GBufferedOutputStreamClass;
typedef struct _GBufferedOutputStreamPrivate GBufferedOutputStreamPrivate;
@@ -59,19 +57,16 @@
struct _GBufferedOutputStreamClass
{
- GOutputStreamClass parent_class;
+ GFilterOutputStreamClass parent_class;
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
void (*_g_reserved2) (void);
- void (*_g_reserved3) (void);
- void (*_g_reserved4) (void);
- void (*_g_reserved5) (void);
};
-GType g_buffered_output_stream_get_type (void) G_GNUC_CONST;
+GType g_buffered_output_stream_get_type (void) G_GNUC_CONST;
GOutputStream* g_buffered_output_stream_new (GOutputStream *base_stream);
GOutputStream* g_buffered_output_stream_new_sized (GOutputStream *base_stream,
gsize size);
diff -r 4df41210333f -r 2e9c32fda335 Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gcancellable.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gcancellable.h Sun Feb 13 19:57:34 2011 +0100
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gcancellable.h Mon Feb 14 22:40:55 2011 +0100
@@ -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,7 @@
#ifndef __G_CANCELLABLE_H__
#define __G_CANCELLABLE_H__
-#include <glib-object.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -40,10 +40,9 @@
/**
* GCancellable:
- *
+ *
* Allows actions to be cancelled.
*/
-typedef struct _GCancellable GCancellable;
typedef struct _GCancellableClass GCancellableClass;
struct _GCancellableClass
@@ -51,7 +50,7 @@
GObjectClass parent_class;
void (* cancelled) (GCancellable *cancellable);
-
+
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
@@ -61,15 +60,19 @@
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);
gboolean g_cancellable_set_error_if_cancelled (GCancellable *cancellable,
GError **error);
+
int g_cancellable_get_fd (GCancellable *cancellable);
+void g_cancellable_make_pollfd (GCancellable *cancellable,
+ GPollFD *pollfd);
+
GCancellable *g_cancellable_get_current (void);
void g_cancellable_push_current (GCancellable *cancellable);
void g_cancellable_pop_current (GCancellable *cancellable);
diff -r 4df41210333f -r 2e9c32fda335 Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gcontenttype.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gcontenttype.h Sun Feb 13 19:57:34 2011 +0100
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gcontenttype.h Mon Feb 14 22:40:55 2011 +0100
@@ -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,8 +27,7 @@
#ifndef __G_CONTENT_TYPE_H__
#define __G_CONTENT_TYPE_H__
-#include <glib.h>
-#include <gio/gicon.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -42,10 +41,14 @@
GIcon * g_content_type_get_icon (const char *type);
gboolean g_content_type_can_be_executable (const char *type);
+char * g_content_type_from_mime_type (const char *mime_type);
+
char * g_content_type_guess (const char *filename,
const guchar *data,
gsize data_size,
- gboolean *result_uncertain );
+ gboolean *result_uncertain);
+
+char ** g_content_type_guess_for_tree (GFile *root);
GList * g_content_types_get_registered (void);
diff -r 4df41210333f -r 2e9c32fda335 Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gdatainputstream.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gdatainputstream.h Sun Feb 13 19:57:34 2011 +0100
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gdatainputstream.h Mon Feb 14 22:40:55 2011 +0100
@@ -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_DATA_INPUT_STREAM_H__
#define __G_DATA_INPUT_STREAM_H__
-#include <glib-object.h>
#include <gio/gbufferedinputstream.h>
G_BEGIN_DECLS
@@ -43,10 +42,9 @@
* 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 _GDataInputStream GDataInputStream;
typedef struct _GDataInputStreamClass GDataInputStreamClass;
typedef struct _GDataInputStreamPrivate GDataInputStreamPrivate;
@@ -60,7 +58,8 @@
struct _GDataInputStreamClass
{
- GBufferedInputStreamClass parent_class;
+ GBufferedInputStreamClass parent_class;
+
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
@@ -70,77 +69,64 @@
void (*_g_reserved5) (void);
};
-/**
- * GDataStreamByteOrder:
- * @G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN: Selects Big Endian byte order.
- * @G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN: Selects Little Endian byte order.
- * @G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN: Selects endianness based on host machine's architecture.
- *
- * #GDataStreamByteOrder is used to ensure proper endianness of streaming data sources
- * across various machine architectures.
- *
- **/
-typedef enum {
- G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN,
- G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN,
- G_DATA_STREAM_BYTE_ORDER_HOST_ENDIAN
-} GDataStreamByteOrder;
+GType g_data_input_stream_get_type (void) G_GNUC_CONST;
+GDataInputStream * g_data_input_stream_new (GInputStream *base_stream);
-/**
- * GDataStreamNewlineType:
- * @G_DATA_STREAM_NEWLINE_TYPE_LF: Selects "LF" line endings, common on most modern UNIX platforms.
- * @G_DATA_STREAM_NEWLINE_TYPE_CR: Selects "CR" line endings.
- * @G_DATA_STREAM_NEWLINE_TYPE_CR_LF: Selects "CR, LF" line ending, common on Microsoft Windows.
- * @G_DATA_STREAM_NEWLINE_TYPE_ANY: Automatically try to handle any line ending type.
- *
- * #GDataStreamNewlineType is used when checking for or setting the line endings for a given file.
- **/
-typedef enum {
- G_DATA_STREAM_NEWLINE_TYPE_LF,
- G_DATA_STREAM_NEWLINE_TYPE_CR,
- G_DATA_STREAM_NEWLINE_TYPE_CR_LF,
- G_DATA_STREAM_NEWLINE_TYPE_ANY
-} GDataStreamNewlineType;
-
-GType g_data_input_stream_get_type (void) G_GNUC_CONST;
-GDataInputStream* g_data_input_stream_new (GInputStream *base_stream);
-
-void g_data_input_stream_set_byte_order (GDataInputStream *stream,
- GDataStreamByteOrder order);
-GDataStreamByteOrder g_data_input_stream_get_byte_order (GDataInputStream *stream);
-void g_data_input_stream_set_newline_type (GDataInputStream *stream,
- GDataStreamNewlineType type);
-GDataStreamNewlineType g_data_input_stream_get_newline_type (GDataInputStream *stream);
-guchar g_data_input_stream_read_byte (GDataInputStream *stream,
- GCancellable *cancellable,
- GError **error);
-gint16 g_data_input_stream_read_int16 (GDataInputStream *stream,
- GCancellable *cancellable,
- GError **error);
-guint16 g_data_input_stream_read_uint16 (GDataInputStream *stream,
- GCancellable *cancellable,
- GError **error);
-gint32 g_data_input_stream_read_int32 (GDataInputStream *stream,
- GCancellable *cancellable,
- GError **error);
-guint32 g_data_input_stream_read_uint32 (GDataInputStream *stream,
- GCancellable *cancellable,
- GError **error);
-gint64 g_data_input_stream_read_int64 (GDataInputStream *stream,
- GCancellable *cancellable,
- GError **error);
-guint64 g_data_input_stream_read_uint64 (GDataInputStream *stream,
- GCancellable *cancellable,
- GError **error);
-char * g_data_input_stream_read_line (GDataInputStream *stream,
- gsize *length,
- GCancellable *cancellable,
- GError **error);
-char * g_data_input_stream_read_until (GDataInputStream *stream,
- const gchar *stop_chars,
- gsize *length,
- GCancellable *cancellable,
- GError **error);
+void g_data_input_stream_set_byte_order (GDataInputStream *stream,
+ GDataStreamByteOrder order);
+GDataStreamByteOrder g_data_input_stream_get_byte_order (GDataInputStream *stream);
+void g_data_input_stream_set_newline_type (GDataInputStream *stream,
+ GDataStreamNewlineType type);
+GDataStreamNewlineType g_data_input_stream_get_newline_type (GDataInputStream *stream);
+guchar g_data_input_stream_read_byte (GDataInputStream *stream,
+ GCancellable *cancellable,
+ GError **error);
+gint16 g_data_input_stream_read_int16 (GDataInputStream *stream,
+ GCancellable *cancellable,
+ GError **error);
+guint16 g_data_input_stream_read_uint16 (GDataInputStream *stream,
+ GCancellable *cancellable,
+ GError **error);
+gint32 g_data_input_stream_read_int32 (GDataInputStream *stream,
+ GCancellable *cancellable,
+ GError **error);
+guint32 g_data_input_stream_read_uint32 (GDataInputStream *stream,
+ GCancellable *cancellable,
+ GError **error);
+gint64 g_data_input_stream_read_int64 (GDataInputStream *stream,
+ GCancellable *cancellable,
+ GError **error);
+guint64 g_data_input_stream_read_uint64 (GDataInputStream *stream,
+ GCancellable *cancellable,
+ GError **error);
+char * g_data_input_stream_read_line (GDataInputStream *stream,
+ gsize *length,
+ GCancellable *cancellable,
+ GError **error);
+void g_data_input_stream_read_line_async (GDataInputStream *stream,
+ gint io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+char * g_data_input_stream_read_line_finish (GDataInputStream *stream,
+ GAsyncResult *result,
+ gsize *length,
+ GError **error);
+char * g_data_input_stream_read_until (GDataInputStream *stream,
+ const gchar *stop_chars,
+ gsize *length,
+ GCancellable *cancellable,
+ GError **error);
+void g_data_input_stream_read_until_async (GDataInputStream *stream,
+ const gchar *stop_chars,
+ gint io_priority,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+char * g_data_input_stream_read_until_finish (GDataInputStream *stream,
+ GAsyncResult *result,
+ gsize *length,
+ GError **error);
G_END_DECLS
diff -r 4df41210333f -r 2e9c32fda335 Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gdataoutputstream.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gdataoutputstream.h Sun Feb 13 19:57:34 2011 +0100
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gdataoutputstream.h Mon Feb 14 22:40:55 2011 +0100
@@ -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,9 +27,7 @@
#ifndef __G_DATA_OUTPUT_STREAM_H__
#define __G_DATA_OUTPUT_STREAM_H__
-#include <glib-object.h>
#include <gio/gfilteroutputstream.h>
-#include <gio/gdatainputstream.h>
G_BEGIN_DECLS
@@ -44,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;
@@ -61,7 +59,8 @@
struct _GDataOutputStreamClass
{
- GFilterOutputStreamClass parent_class;
+ GFilterOutputStreamClass parent_class;
+
/*< private >*/
/* Padding for future expansion */
void (*_g_reserved1) (void);
@@ -72,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);
diff -r 4df41210333f -r 2e9c32fda335 Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gdrive.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gdrive.h Sun Feb 13 19:57:34 2011 +0100
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gdrive.h Mon Feb 14 22:40:55 2011 +0100
@@ -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
@@ -28,10 +28,7 @@
#ifndef __G_DRIVE_H__
#define __G_DRIVE_H__
-#include <glib-object.h>
-#include <gio/gmount.h>
-#include <gio/gvolume.h>
-#include <gio/gmountoperation.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -59,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
@@ -74,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_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_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);
diff -r 4df41210333f -r 2e9c32fda335 Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gfile.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gfile.h Sun Feb 13 19:57:34 2011 +0100
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gio/gfile.h Mon Feb 14 22:40:55 2011 +0100
@@ -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,13 +27,7 @@
#ifndef __G_FILE_H__
#define __G_FILE_H__
-#include <glib-object.h>
-#include <gio/gfileinfo.h>
-#include <gio/gfileenumerator.h>
-#include <gio/gfileinputstream.h>
-#include <gio/gfileoutputstream.h>
-#include <gio/gmountoperation.h>
-#include <gio/gappinfo.h>
+#include <gio/giotypes.h>
G_BEGIN_DECLS
@@ -42,136 +36,18 @@
#define G_IS_FILE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), G_TYPE_FILE))
#define G_FILE_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), G_TYPE_FILE, GFileIface))
-/**
- * GFileQueryInfoFlags:
- * @G_FILE_QUERY_INFO_NONE: No flags set.
- * @G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS: Don't follow symlinks.
- *
- * Flags used when querying a #GFileInfo.
- */
-typedef enum {
- G_FILE_QUERY_INFO_NONE = 0,
- G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS = (1<<0) /*< nick=nofollow-symlinks >*/
-} GFileQueryInfoFlags;
-
-/**
- * GFileCreateFlags:
- * @G_FILE_CREATE_NONE: No flags set.
- * @G_FILE_CREATE_PRIVATE: Create a file that can only be
- * accessed by the current user.
- *
- * Flags used when an operation may create a file.
- */
-typedef enum {
- G_FILE_CREATE_NONE = 0,
- G_FILE_CREATE_PRIVATE = (1<<0)
-} GFileCreateFlags;
-
-
-/**
- * GMountMountFlags:
- * @G_MOUNT_MOUNT_NONE: No flags set.
- *
- * Flags used when mounting a mount.
- */
-typedef enum {
- G_MOUNT_MOUNT_NONE = 0
-} GMountMountFlags;
-
-
-/**
- * GMountUnmountFlags:
- * @G_MOUNT_UNMOUNT_NONE: No flags set.
- * @G_MOUNT_UNMOUNT_FORCE: Unmount even if there are outstanding
- * file operations on the mount.
- *
- * Flags used when an unmounting a mount.
- */
-typedef enum {
- G_MOUNT_UNMOUNT_NONE = 0,
- G_MOUNT_UNMOUNT_FORCE = (1<<0)
-} GMountUnmountFlags;
-
-/**
- * GFileCopyFlags:
- * @G_FILE_COPY_NONE: No flags set.
- * @G_FILE_COPY_OVERWRITE: Overwrite any existing files
- * @G_FILE_COPY_BACKUP: Make a backup of any existing files.
- * @G_FILE_COPY_NOFOLLOW_SYMLINKS: Don't follow symlinks.
- * @G_FILE_COPY_ALL_METADATA: Copy all file metadata instead of just default set used for copy (see #GFileInfo).
- * @G_FILE_COPY_NO_FALLBACK_FOR_MOVE: Don't use copy and delete fallback if native move not supported.
- *
- * Flags used when copying or moving files.
- */
-typedef enum {
- G_FILE_COPY_NONE = 0, /*< nick=none >*/
- G_FILE_COPY_OVERWRITE = (1<<0),
- G_FILE_COPY_BACKUP = (1<<1),
- G_FILE_COPY_NOFOLLOW_SYMLINKS = (1<<2),
- G_FILE_COPY_ALL_METADATA = (1<<3),
- G_FILE_COPY_NO_FALLBACK_FOR_MOVE = (1<<4)
-} GFileCopyFlags;
-
-/**
- * GFileMonitorFlags:
- * @G_FILE_MONITOR_NONE: No flags set.
- * @G_FILE_MONITOR_WATCH_MOUNTS: Watch for mount events.
- *
- * Flags used to set what a #GFileMonitor will watch for.
- */
-typedef enum {
- G_FILE_MONITOR_NONE = 0,
- G_FILE_MONITOR_WATCH_MOUNTS = (1<<0)
-} GFileMonitorFlags;
-
+#if 0
/**
* GFile:
- *
- * 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 */
+#endif
typedef struct _GFileIface GFileIface;
-typedef struct _GFileMonitor GFileMonitor;
-/**
- * GMount:
- *
- * A handle to an object implementing the #GMountIface interface.
- **/
-typedef struct _GMount GMount; /* Dummy typedef */
-
-/**
- * GFileProgressCallback:
- * @current_num_bytes: the current number of bytes in the operation.
- * @total_num_bytes: the total number of bytes in the operation.
- * @user_data: user data passed to the callback.
- *
- * When doing file operations that may take a while, such as moving
- * a file or copying a file, a progress callback is used to pass how
- * far along that operation is to the application.
- **/
-typedef void (*GFileProgressCallback) (goffset current_num_bytes,
- goffset total_num_bytes,
- gpointer user_data);
-
-/**
- * GFileReadMoreCallback:
- * @file_contents: the data as currently read.
- * @file_size: the size of the data currently read.
- * @callback_data: data passed to the callback.
- *
- * When loading the partial contents of a file with g_file_read_partial_contents(),
- * it may become necessary to determine if any more data from the file should be loaded.
- * A #GFileReadMoreCallback function facilitates this by returning %TRUE if more data
- * should be read, or %FALSE otherwise.
- *
- * Returns: %TRUE if more data should be read back. %FALSE otherwise.
- **/
-typedef gboolean (* GFileReadMoreCallback) (const char *file_contents,
More information about the commits
mailing list