X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgiotypes.h;h=a3abecc6f790bae1a5a83228d7abdb8635f0bd6f;hb=a6f83d73e59cc2ab0353ff3edf38d27185852581;hp=3cc4f66b7395d53b322244e1fd96aa8de9383f27;hpb=0e352fdb182e63ff163b0feda198cb3b6b20aa3a;p=platform%2Fupstream%2Fglib.git diff --git a/gio/giotypes.h b/gio/giotypes.h index 3cc4f66..a3abecc 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; @@ -106,7 +112,7 @@ typedef struct _GIOExtension GIOExtension; /** * GIOSchedulerJob: * - * Opaque class for definining and scheduling IO jobs. + * Opaque class for defining and scheduling IO jobs. **/ typedef struct _GIOSchedulerJob GIOSchedulerJob; typedef struct _GIOStreamAdapter GIOStreamAdapter; @@ -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 @@ -205,11 +220,12 @@ typedef struct _GThreadedSocketService GThreadedSocketServi typedef struct _GThemedIcon GThemedIcon; typedef struct _GTlsCertificate GTlsCertificate; typedef struct _GTlsClientConnection GTlsClientConnection; /* Dummy typedef */ -typedef struct _GTlsClientContext GTlsClientContext; /* Dummy typedef */ typedef struct _GTlsConnection GTlsConnection; -typedef struct _GTlsContext GTlsContext; +typedef struct _GTlsDatabase GTlsDatabase; +typedef struct _GTlsFileDatabase GTlsFileDatabase; +typedef struct _GTlsInteraction GTlsInteraction; +typedef struct _GTlsPassword GTlsPassword; typedef struct _GTlsServerConnection GTlsServerConnection; /* Dummy typedef */ -typedef struct _GTlsServerContext GTlsServerContext; /* Dummy typedef */ typedef struct _GVfs GVfs; /* Dummy typedef */ /** @@ -285,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. *