X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgiotypes.h;h=de62cefa2bdc1c71aa7dbd19d5b4cf07c465b1ed;hb=356a3987cee7ceddcb3fe623edf0bd2881895add;hp=e34164db332ebcd754e087ea5a6cdfd7d2346394;hpb=1b28408b8bfe282f671716a39bba3208d3fef39a;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/giotypes.h b/gio/giotypes.h
index e34164d..de62cef 100644
--- a/gio/giotypes.h
+++ b/gio/giotypes.h
@@ -13,20 +13,18 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see .
*
* Author: Alexander Larsson
*/
+#ifndef __GIO_TYPES_H__
+#define __GIO_TYPES_H__
+
#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
#error "Only can be included directly."
#endif
-#ifndef __GIO_TYPES_H__
-#define __GIO_TYPES_H__
-
#include
G_BEGIN_DECLS
@@ -48,7 +46,11 @@ typedef struct _GZlibCompressor GZlibCompressor;
typedef struct _GZlibDecompressor GZlibDecompressor;
typedef struct _GSimpleActionGroup GSimpleActionGroup;
+typedef struct _GRemoteActionGroup GRemoteActionGroup;
+typedef struct _GDBusActionGroup GDBusActionGroup;
+typedef struct _GActionMap GActionMap;
typedef struct _GActionGroup GActionGroup;
+typedef struct _GPropertyAction GPropertyAction;
typedef struct _GSimpleAction GSimpleAction;
typedef struct _GAction GAction;
typedef struct _GApplication GApplication;
@@ -57,6 +59,9 @@ typedef struct _GSettingsBackend GSettingsBackend;
typedef struct _GSettings GSettings;
typedef struct _GPermission GPermission;
+typedef struct _GMenuModel GMenuModel;
+typedef struct _GNotification GNotification;
+
/**
* GDrive:
*
@@ -96,6 +101,7 @@ typedef struct _GFilenameCompleter GFilenameCompleter;
typedef struct _GIcon GIcon; /* Dummy typedef */
typedef struct _GInetAddress GInetAddress;
+typedef struct _GInetAddressMask GInetAddressMask;
typedef struct _GInetSocketAddress GInetSocketAddress;
typedef struct _GInputStream GInputStream;
typedef struct _GInitable GInitable;
@@ -111,6 +117,7 @@ typedef struct _GIOExtension GIOExtension;
typedef struct _GIOSchedulerJob GIOSchedulerJob;
typedef struct _GIOStreamAdapter GIOStreamAdapter;
typedef struct _GLoadableIcon GLoadableIcon; /* Dummy typedef */
+typedef struct _GBytesIcon GBytesIcon;
typedef struct _GMemoryInputStream GMemoryInputStream;
typedef struct _GMemoryOutputStream GMemoryOutputStream;
@@ -122,12 +129,22 @@ typedef struct _GMemoryOutputStream GMemoryOutputStream;
typedef struct _GMount GMount; /* Dummy typedef */
typedef struct _GMountOperation GMountOperation;
typedef struct _GNetworkAddress GNetworkAddress;
+typedef struct _GNetworkMonitor GNetworkMonitor;
typedef struct _GNetworkService GNetworkService;
typedef struct _GOutputStream GOutputStream;
typedef struct _GIOStream GIOStream;
typedef struct _GPollableInputStream GPollableInputStream; /* Dummy typedef */
typedef struct _GPollableOutputStream GPollableOutputStream; /* Dummy typedef */
typedef struct _GResolver GResolver;
+
+/**
+ * GResource:
+ *
+ * A resource bundle.
+ *
+ * Since: 2.32
+ */
+typedef struct _GResource GResource;
typedef struct _GSeekable GSeekable;
typedef struct _GSimpleAsyncResult GSimpleAsyncResult;
@@ -164,7 +181,7 @@ typedef struct _GSocketClient GSocketClient;
**/
typedef struct _GSocketConnection GSocketConnection;
/**
- * GSocketClient:
+ * GSocketListener:
*
* A helper class for network servers to listen for and accept connections.
*
@@ -184,6 +201,7 @@ typedef struct _GSocketAddress GSocketAddress;
typedef struct _GSocketAddressEnumerator GSocketAddressEnumerator;
typedef struct _GSocketConnectable GSocketConnectable;
typedef struct _GSrvTarget GSrvTarget;
+typedef struct _GTask GTask;
/**
* GTcpConnection:
*
@@ -196,7 +214,7 @@ typedef struct _GTcpWrapperConnection GTcpWrapperConnectio
/**
* GThreadedSocketService:
*
- * A helper class for handling accepting incomming connections in the
+ * A helper class for handling accepting incoming connections in the
* glib mainloop and handling them in a thread.
*
* Since: 2.22
@@ -277,6 +295,49 @@ typedef gboolean (* GFileReadMoreCallback) (const char *file_contents,
goffset file_size,
gpointer callback_data);
+/**
+ * GFileMeasureProgressCallback:
+ * @reporting: %TRUE if more reports will come
+ * @current_size: the current cumulative size measurement
+ * @num_dirs: the number of directories visited so far
+ * @num_files: the number of non-directory files encountered
+ * @user_data: the data passed to the original request for this callback
+ *
+ * This callback type is used by g_file_measure_disk_usage() to make
+ * periodic progress reports when measuring the amount of disk spaced
+ * used by a directory.
+ *
+ * These calls are made on a best-effort basis and not all types of
+ * #GFile will support them. At the minimum, however, one call will
+ * always be made immediately.
+ *
+ * In the case that there is no support, @reporting will be set to
+ * %FALSE (and the other values undefined) and no further calls will be
+ * made. Otherwise, the @reporting will be %TRUE and the other values
+ * all-zeros during the first (immediate) call. In this way, you can
+ * know which type of progress UI to show without a delay.
+ *
+ * For g_file_measure_disk_usage() the callback is made directly. For
+ * g_file_measure_disk_usage_async() the callback is made via the
+ * default main context of the calling thread (ie: the same way that the
+ * final async result would be reported).
+ *
+ * @current_size is in the same units as requested by the operation (see
+ * %G_FILE_DISK_USAGE_APPARENT_SIZE).
+ *
+ * The frequency of the updates is implementation defined, but is
+ * ideally about once every 200ms.
+ *
+ * The last progress callback may or may not be equal to the final
+ * result. Always check the async result to get the final value.
+ *
+ * Since: 2.38
+ **/
+typedef void (* GFileMeasureProgressCallback) (gboolean reporting,
+ guint64 current_size,
+ guint64 num_dirs,
+ guint64 num_files,
+ gpointer user_data);
/**
* GIOSchedulerJobFunc:
@@ -286,10 +347,6 @@ typedef gboolean (* GFileReadMoreCallback) (const char *file_contents,
*
* I/O Job function.
*
- * Note that depending on whether threads are available, the
- * #GIOScheduler may run jobs in separate threads or in an idle
- * in the mainloop.
- *
* Long-running jobs should periodically check the @cancellable
* to see if they have been cancelled.
*
@@ -336,7 +393,7 @@ typedef gboolean (*GSocketSourceFunc) (GSocket *socket,
* @size: the available size in @buffer.
*
* Structure used for scatter/gather data input.
- * You generally pass in an array of #GInputVectors
+ * You generally pass in an array of #GInputVectors
* and the operation will store the read data starting in the
* first buffer, switching to the next as needed.
*
@@ -355,7 +412,7 @@ struct _GInputVector {
* @size: the size of @buffer.
*
* Structure used for scatter/gather data output.
- * You generally pass in an array of #GOutputVectors
+ * You generally pass in an array of #GOutputVectors
* and the operation will use all the buffers as if they were
* one buffer.
*
@@ -440,7 +497,7 @@ typedef struct _GDBusObjectManagerServer GDBusObjectManagerServer;
* object proxy (if @interface_name is %NULL).
*
* This function is called in the
- * thread-default main loop
+ * [thread-default main loop][g-main-context-push-thread-default]
* that @manager was constructed in.
*
* Returns: A #GType to use for the remote object. The returned type
@@ -454,6 +511,25 @@ typedef GType (*GDBusProxyTypeFunc) (GDBusObjectManagerClient *manager,
const gchar *interface_name,
gpointer user_data);
+typedef struct _GTestDBus GTestDBus;
+
+/**
+ * GSubprocess:
+ *
+ * A child process.
+ *
+ * Since: 2.40
+ */
+typedef struct _GSubprocess GSubprocess;
+/**
+ * GSubprocessLauncher:
+ *
+ * Options for launching a child process.
+ *
+ * Since: 2.40
+ */
+typedef struct _GSubprocessLauncher GSubprocessLauncher;
+
G_END_DECLS
#endif /* __GIO_TYPES_H__ */