X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgiotypes.h;h=876d856cda34d80f341e65d104a15a4116de7b6a;hb=dccce383670592f12510019e92ea91a618a1810c;hp=e34164db332ebcd754e087ea5a6cdfd7d2346394;hpb=1b28408b8bfe282f671716a39bba3208d3fef39a;p=platform%2Fupstream%2Fglib.git diff --git a/gio/giotypes.h b/gio/giotypes.h index e34164d..876d856 100644 --- a/gio/giotypes.h +++ b/gio/giotypes.h @@ -48,6 +48,9 @@ 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 _GSimpleAction GSimpleAction; typedef struct _GAction GAction; @@ -57,6 +60,8 @@ typedef struct _GSettingsBackend GSettingsBackend; typedef struct _GSettings GSettings; typedef struct _GPermission GPermission; +typedef struct _GMenuModel GMenuModel; + /** * 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; @@ -122,12 +128,21 @@ 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 +179,7 @@ typedef struct _GSocketClient GSocketClient; **/ typedef struct _GSocketConnection GSocketConnection; /** - * GSocketClient: + * GSocketListener: * * A helper class for network servers to listen for and accept connections. * @@ -196,7 +211,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 @@ -286,10 +301,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. * @@ -454,6 +465,8 @@ typedef GType (*GDBusProxyTypeFunc) (GDBusObjectManagerClient *manager, const gchar *interface_name, gpointer user_data); +typedef struct _GTestDBus GTestDBus; + G_END_DECLS #endif /* __GIO_TYPES_H__ */