luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-09 19:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix up a bunch of details in the docs.

Browse Source 
2007-12-12  Alexander Larsson  <alexl@redhat.com>

        * gappinfo.[ch]:
        * gasyncresult.c:
        * gbufferedinputstream.c:
        * gbufferedoutputstream.c:
        * gcancellable.c:
        * gcontenttype.c:
        * gdatainputstream.[ch]:
        * gdesktopappinfo.c:
        * gdirectorymonitor.c:
        * gfile.[ch]:
        * gfileattribute.[ch]:
        * gfileicon.[ch]:
        * gfileinfo.h:
        * gfileinputstream.h:
        * gfilemonitor.[ch]:
        * gfileoutputstream.[ch]:
        * gfilterinputstream.h:
        * gfilteroutputstream.h:
        * gicon.h:
        * gioscheduler.c:
        * gloadableicon.[ch]:
        * gmemoryinputstream.c:
        * gmountoperation.c:
        * gthemedicon.c:
	Fix up a bunch of details in the docs.

        * glocalfileinfo.c:
	CR/LF -> LF fixups


svn path=/trunk/; revision=6100
This commit is contained in:
Alexander Larsson 2007-12-12 12:19:02 +00:00 committed by Alexander Larsson
parent 2de9f839a0
commit 41d1650c9b
34 changed files with 686 additions and 533 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gio/ChangeLog
View File

@ -1,3 +1,34 @@
2007-12-12 Alexander Larsson <alexl@redhat.com>
* gappinfo.[ch]:
* gasyncresult.c:
* gbufferedinputstream.c:
* gbufferedoutputstream.c:
* gcancellable.c:
* gcontenttype.c:
* gdatainputstream.[ch]:
* gdesktopappinfo.c:
* gdirectorymonitor.c:
* gfile.[ch]:
* gfileattribute.[ch]:
* gfileicon.[ch]:
* gfileinfo.h:
* gfileinputstream.h:
* gfilemonitor.[ch]:
* gfileoutputstream.[ch]:
* gfilterinputstream.h:
* gfilteroutputstream.h:
* gicon.h:
* gioscheduler.c:
* gloadableicon.[ch]:
* gmemoryinputstream.c:
* gmountoperation.c:
* gthemedicon.c:
Fix up a bunch of details in the docs.
* glocalfileinfo.c:
CR/LF -> LF fixups
2007-12-11 David Zeuthen <davidz@redhat.com>
Rework how volumes, drives and volume monitoring is

78
gio/gappinfo.c
View File

@ -33,7 +33,7 @@
* @stability: Unstable
*
* #GAppInfo and #GAppLaunchContext are used for describing and launching
* installed system applications.
* applications installed on the system.
*
**/
@ -134,7 +134,10 @@ g_app_info_equal (GAppInfo *appinfo1,
* g_app_info_get_id:
* @appinfo: a #GAppInfo.
*
* Gets the ID of an application.
* Gets the ID of an application. An id is a string that
* identifies the application. The exact format of the id is
* platform dependent. For instance on Unix this is the
* desktop file id from the xdg menu specification.
*
* Returns: a string containing the application's ID.
**/
@ -177,7 +180,7 @@ g_app_info_get_name (GAppInfo *appinfo)
* Gets a human-readable description of an installed application.
*
* Returns: a string containing a description of the
* application @appinfo. The returned string should be not freed
* application @appinfo, or %NULL if none. The returned string should be not freed
* when no longer needed.
**/
const char *
@ -220,11 +223,9 @@ g_app_info_get_executable (GAppInfo *appinfo)
* @content_type: the content type.
* @error: a #GError.
*
* Sets an application as the default handler for a given type.
* Sets the application as the default handler for a given type.
*
* Returns: %TRUE if the given @appinfo is the default
* for the given @content_type. %FALSE if not,
* or in case of an error.
* Returns: %TRUE on success, %FALSE on error.
**/
gboolean
g_app_info_set_as_default_for_type (GAppInfo *appinfo,
@ -245,14 +246,12 @@ g_app_info_set_as_default_for_type (GAppInfo *appinfo,
/**
* g_app_info_set_as_default_for_extension:
* @appinfo: a #GAppInfo.
* @extension: a string containing the file extension.
* @extension: a string containing the file extension (without the dot).
* @error: a #GError.
*
* Sets an application as the default handler for the given file extention.
* Sets the application as the default handler for the given file extention.
*
* Returns: %TRUE if the given @appinfo is the default
* for the given @extension. %FALSE if not,
* or in case of an error.
* Returns: %TRUE on success, %FALSE on error.
**/
gboolean
g_app_info_set_as_default_for_extension (GAppInfo *appinfo,
@ -283,8 +282,7 @@ g_app_info_set_as_default_for_extension (GAppInfo *appinfo,
* Adds a content type to the application information to indicate the
* application is capable of opening files with the given content type.
*
* Returns: %TRUE if @appinfo supports @content_type.
* %FALSE if not, or in case of an error.
* Returns: %TRUE on success, %FALSE on error.
**/
gboolean
g_app_info_add_supports_type (GAppInfo *appinfo,
@ -342,8 +340,7 @@ g_app_info_can_remove_supports_type (GAppInfo *appinfo)
*
* Removes a supported type from an application, if possible.
*
* Returns: %TRUE if @content_type support was removed
* from @appinfo. %FALSE if not.
* Returns: %TRUE on success, %FALSE on error.
**/
gboolean
g_app_info_remove_supports_type (GAppInfo *appinfo,
@ -372,7 +369,7 @@ g_app_info_remove_supports_type (GAppInfo *appinfo,
* g_app_info_get_icon:
* @appinfo: a #GAppInfo.
*
* Gets the default icon for the application.
* Gets the icon for the application.
*
* Returns: the default #GIcon for @appinfo.
**/
@ -397,10 +394,17 @@ g_app_info_get_icon (GAppInfo *appinfo)
* @error: a #GError.
*
* Launches the application. Passes @files to the launched application
* as arguments, and loads the @launch_context for managing the application
* once it has been launched. On error, @error will be set accordingly.
* as arguments, using the optional @launch_context to get information
* about the details of the launcher (like what screen its is on).
* On error, @error will be set accordingly.
*
* Returns: %TRUE on successful launch, %FALSE otherwise.
* To lauch the application without arguments pass a %NULL @files list.
*
* Note that even if the launch is successful the application launched
* can fail to start if it runs into problems during startup. There is
* no way to detect this.
*
* Returns: %TRUE on successful launch, %FALSE otherwise.
**/
gboolean
g_app_info_launch (GAppInfo *appinfo,
@ -447,10 +451,17 @@ g_app_info_supports_uris (GAppInfo *appinfo)
* @error: a #GError.
*
* Launches the application. Passes @uris to the launched application
* as arguments, and loads the @launch_context for managing the application
* once it has been launched. On error, @error will be set accordingly.
* as arguments, using the optional @launch_context to get information
* about the details of the launcher (like what screen its is on).
* On error, @error will be set accordingly.
*
* Returns: %TRUE if the @appinfo was launched successfully, %FALSE otherwise.
* To lauch the application without arguments pass a %NULL @uris list.
*
* Note that even if the launch is successful the application launched
* can fail to start if it runs into problems during startup. There is
* no way to detect this.
*
* Returns: %TRUE on successful launch, %FALSE otherwise.
**/
gboolean
g_app_info_launch_uris (GAppInfo *appinfo,
@ -471,10 +482,14 @@ g_app_info_launch_uris (GAppInfo *appinfo,
/**
* g_app_info_should_show:
* @appinfo: a #GAppInfo.
* @desktop_env: a string.
* @desktop_env: A string specifying what desktop this is, or %NULL.
*
* Checks if the application info should be shown when listing
* applications available.
*
* @destkop_env is used to hide applications that are specified to
* just show up in specific desktops. For instance, passing in "GNOME"
* would show all applications specific to the Gnome desktop.
*
* Returns: %TRUE if the @appinfo should be shown, %FALSE otherwise.
**/
@ -496,7 +511,8 @@ G_DEFINE_TYPE (GAppLaunchContext, g_app_launch_context, G_TYPE_OBJECT);
/**
* g_app_launch_context_new:
*
* Creates a new application launch context.
* Creates a new application launch context. This is not normally used,
* instead you instantiate a subclass of this, such as GdkLaunchContext.
*
* Returns: a #GAppLaunchContext.
**/
@ -546,14 +562,15 @@ g_app_launch_context_get_display (GAppLaunchContext *context,
return class->get_display (context, info, files);
}
/* should this be moved to the g_desktop_app_ implementation? */
/**
* g_app_launch_context_get_startup_notify_id:
* @context: a #GAppLaunchContext.
* @info: a #GAppInfo.
* @files: a #GList of files.
*
* Gets the DESKTOP_STARTUP_ID for the launched application, if supported.
* Initiates startup notification for the applicaiont and returns the
* DESKTOP_STARTUP_ID for the launched operation, if supported.
*
* Startup notification IDs are defined in the FreeDesktop.Org Startup
* Notifications standard, at
* <ulink url="http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt"/>.
@ -583,11 +600,10 @@ g_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
/**
* g_app_launch_context_launch_failed:
* @context: a #GAppLaunchContext.
* @startup_notify_id: a string containing the DESKTOP_STARTUP_ID
* of the launched application.
* @startup_notify_id: the startup notification id that was returned by g_app_launch_context_get_startup_notify_id().
*
* Called when an application has failed to launch, and cancels the
* application startup notification.
* Called when an application has failed to launch, so that it can cancel
* the application startup notification started in g_app_launch_context_get_startup_notify_id().
*
**/
void

31
gio/gappinfo.h
View File

@ -43,7 +43,7 @@ G_BEGIN_DECLS
/**
* GAppInfoCreateFlags:
* @G_APP_INFO_CREATE_FLAGS_NONE: No flags.
* @G_APP_INFO_CREATE_NEEDS_TERMINAL: Application opens with a terminal window.
* @G_APP_INFO_CREATE_NEEDS_TERMINAL: Application opens in a terminal window.
*
* Flags used when creating a #GAppInfo.
*/
@ -59,7 +59,8 @@ typedef struct _GAppLaunchContextPrivate GAppLaunchContextPrivate;
/**
* GAppInfo:
*
* Information about an installed application.
* Information about an installed application and methods to launch
* it (with file arguments).
*/
typedef struct _GAppInfo GAppInfo; /* Dummy typedef */
@ -77,7 +78,6 @@ typedef struct _GAppInfo GAppInfo; /* Dummy typedef */
* @supports_uris: Indicates whether the application specified supports launching URIs.
* @launch_uris: Launches an application with a list of URIs.
* @should_show: Returns whether an application should be shown (e.g. when getting a list of installed applications).
* @supports_xdg_startup_notify: Indicates whether the application supports the
* <ulink url="http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">
* <citetitle>FreeDesktop.Org Startup Notification Specification</citetitle></ulink>.
* @set_as_default_for_type: Sets an application as default for a given content type.
@ -115,8 +115,6 @@ struct _GAppInfoIface
GError **error);
gboolean (*should_show) (GAppInfo *appinfo,
const char *desktop_env);
gboolean (*supports_xdg_startup_notify) (GAppInfo *appinfo);
/* For changing associations */
gboolean (*set_as_default_for_type) (GAppInfo *appinfo,
@ -132,18 +130,6 @@ struct _GAppInfoIface
gboolean (*remove_supports_type) (GAppInfo *appinfo,
const char *content_type,
GError **error);
/*< 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);
void (*_g_reserved6) (void);
void (*_g_reserved7) (void);
void (*_g_reserved8) (void);
void (*_g_reserved9) (void);
void (*_g_reserved10) (void);
};
GType g_app_info_get_type (void) G_GNUC_CONST;
@ -193,18 +179,13 @@ 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);
/* TODO: missing operations:
add app as supporting a content type, but don't make it default
implement set_as_default_for_extension
can_remove, remove (as in, don't support a specific mimetype)
*/
/**
* GAppLaunchContext:
* @parent_instance: The parent instance.
*
* Gets feedback from the system when launching an application.
* 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.
*/
struct _GAppLaunchContext
{

13
gio/gasyncresult.c
View File

@ -52,7 +52,8 @@
* of the operation is not needed, there is no need to call the
* "_finish()" function, GIO will take care of cleaning up the
* result and error information after the #GAsyncReadyCallback
* returns.
* returns. It is also allowed to take a reference to the #GAsyncResult and
* call "_finish()" later.
*
* Example of a typical asynchronous operation flow:
* |[
@ -96,9 +97,15 @@
* /<!-- -->* ... *<!-- -->/
* }
* ]|
*
* The callback for an asynchronous operation is called only once, and is
* always called, even in the case of a cancelled operation. On cancellation
* the result is a %G_IO_ERROR_CANCELLED error.
*
* Asynchronous jobs are threaded if #GThread is available, but also may
* be sent to the Main Event Loop and processed in an idle function.
* Some ascynchronous operations are implemented using synchronous call. These
* are run in a separate #GThread has been initialized, but otherwise they
* are sent to the Main Event Loop and processed in an idle function. So, if you
* truly need asynchronous operations, make sure to initialize #GThread.
**/
static void g_async_result_base_init (gpointer g_class);

4
gio/gbufferedinputstream.c
View File

@ -177,12 +177,12 @@ g_buffered_input_stream_class_init (GBufferedInputStreamClass *klass)
*
* Gets the size of the input buffer.
*
* Returns: the current buffer size, or %-1 on error.
* Returns: the current buffer size.
**/
gsize
g_buffered_input_stream_get_buffer_size (GBufferedInputStream *stream)
{
g_return_val_if_fail (G_IS_BUFFERED_INPUT_STREAM (stream), -1);
g_return_val_if_fail (G_IS_BUFFERED_INPUT_STREAM (stream), 0);
return stream->priv->len;
}

3
gio/gbufferedoutputstream.c
View File

@ -248,6 +248,9 @@ g_buffered_output_stream_get_auto_grow (GBufferedOutputStream *stream)
* @auto_grow: a #gboolean.
*
* Sets whether or not the @stream's buffer should automatically grow.
* If @auto_grow is true, then each write will just make the buffer
* larger, and you must manually flush the buffer to actually write out
* the data to the underlying stream.
**/
void
g_buffered_output_stream_set_auto_grow (GBufferedOutputStream *stream,

40
gio/gcancellable.c
View File

@ -43,7 +43,8 @@
* @include: gio/gcancellable.h
*
* GCancellable is a thread-safe operation cancellation stack used
* throughout GIO to allow for cancellation of asynchronous operations.
* throughout GIO to allow for cancellation of synchronous and
* asynchronous operations.
*/
enum {
@ -94,6 +95,10 @@ g_cancellable_class_init (GCancellableClass *klass)
* @cancellable: a #GCancellable.
*
* Emitted when the operation has been cancelled from another thread.
*
* Can be used by implementations of cancellable operations. This will
* be emitted in the thread that tried to cancel the operation, not the
* thread the is running the operation.
*/
signals[CANCELLED] =
g_signal_new (I_("cancelled"),
@ -149,6 +154,13 @@ g_cancellable_init (GCancellable *cancellable)
* g_cancellable_new:
*
* Creates a new #GCancellable object.
*
* Applications that want to start one or more operations
* that should be cancellable should create a #GCancellable
* and pass it to the operations.
*
* One #GCancellable can be used in multiple consecutive
* operations, but not in multiple concurrent operations.
*
* Returns: a #GCancellable.
**/
@ -162,7 +174,14 @@ g_cancellable_new (void)
* g_push_current_cancellable:
* @cancellable: optional #GCancellable object, %NULL to ignore.
*
* Pushes @cancellable onto the cancellable stack.
* Pushes @cancellable onto the cancellable stack. The current
* cancllable can then be recieved using g_cancellable_get_current().
*
* This is useful when implementing cancellable operations in
* code that does not allow you to pass down the cancellable object.
*
* This is typically called automatically by e.g. #GFile operations,
* so you rarely have to call this yourself.
**/
void
g_push_current_cancellable (GCancellable *cancellable)
@ -180,8 +199,8 @@ g_push_current_cancellable (GCancellable *cancellable)
* g_pop_current_cancellable:
* @cancellable: optional #GCancellable object, %NULL to ignore.
*
* Pops @cancellable off the cancellable stack if @cancellable
* is on the top of the stack.
* Pops @cancellable off the cancellable stack (verifying that @cancellable
* is on the top of the stack).
**/
void
g_pop_current_cancellable (GCancellable *cancellable)
@ -260,7 +279,8 @@ g_cancellable_is_cancelled (GCancellable *cancellable)
* @cancellable: a #GCancellable object.
* @error: #GError to append error state to.
*
* Sets the current error to notify that the operation was cancelled.
* If the @cancelalble is cancelled, sets the error to notify
* that the operation was cancelled.
*
* Returns: %TRUE if @cancellable was cancelled, %FALSE if it was not.
**/
@ -284,7 +304,9 @@ g_cancellable_set_error_if_cancelled (GCancellable *cancellable,
* g_cancellable_get_fd:
* @cancellable: a #GCancellable.
*
* Gets the file descriptor for a cancellable job.
* Gets the file descriptor for a cancellable job. This can be used to
* implement cancellable operations on Unix systems. The returned fd will
* turn readable when @cancellable is cancelled.
*
* Returns: A valid file descriptor. %-1 if the file descriptor
* is not supported, or on errors.
@ -314,7 +336,11 @@ g_cancellable_get_fd (GCancellable *cancellable)
* @cancellable: a #GCancellable object.
*
* Will set @cancellable to cancelled, and will emit the CANCELLED
* signal. This function is thread-safe.
* signal.
*
* This function is thread-safe. In other words, you can safely call it from
* another thread than the one running an operation that was passed
* the @cancellable.
**/
void
g_cancellable_cancel (GCancellable *cancellable)

14
gio/gcontenttype.c
View File

@ -399,9 +399,11 @@ g_content_type_is_a (const char *type,
* g_content_type_is_unknown:
* @type: a content type string.
*
* Checks if the content type is known by GIO.
* Checks if the content type is the generic "unknown" type.
* On unix this is the "application/octet-stream" mimetype,
* while on win32 it is "*".
*
* Returns: %TRUE if the type is unknown.
* Returns: %TRUE if the type is the unknown type.
**/
gboolean
g_content_type_is_unknown (const char *type)
@ -610,9 +612,9 @@ g_content_type_get_description (const char *type)
* g_content_type_get_mime_type:
* @type: a content type string.
*
* Gets the mime-type for the content type.
* Gets the mime-type for the content type. If one is registered
*
* Returns: the registered mime-type for the given @type.
* Returns: the registered mime-type for the given @type, or NULL if unknown.
**/
char *
g_content_type_get_mime_type (const char *type)
@ -847,8 +849,8 @@ enumerate_mimetypes_dir (const char *dir,
/**
* g_content_types_get_registered:
*
* Gets a list of strings containing the registered content types on
* the system.
* Gets a list of strings containing all the registered content types
* known to the system.
*
* Returns: #GList of the registered content types.
**/

27
gio/gdatainputstream.c
View File

@ -34,7 +34,7 @@
* @see_also: #GInputStream
*
* Data input stream implements #GInputStream and includes functions for
* reading data directly from an input stream.
* reading structured data directly from a binary input stream.
*
**/
@ -246,8 +246,9 @@ g_data_input_stream_get_byte_order (GDataInputStream *stream)
*
* Sets the newline type for the @stream.
*
* TODO: is it valid to set this to G_DATA_STREAM_NEWLINE_TYPE_ANY, or
* should it always be set to {_LF, _CR, _CR_LF}
* Note that using G_DATA_STREAM_NEWLINE_TYPE_ANY is slightly unsafe. If a read
* chunk ends in "CR" we must read an additional byte to know if this is "CR" or
* "CR LF", and this might block if there is no more data availible.
*
**/
void
@ -331,8 +332,8 @@ read_data (GDataInputStream *stream,
**/
guchar
g_data_input_stream_read_byte (GDataInputStream *stream,
GCancellable *cancellable,
GError **error)
GCancellable *cancellable,
GError **error)
{
guchar c;
@ -405,8 +406,8 @@ g_data_input_stream_read_int16 (GDataInputStream *stream,
**/
guint16
g_data_input_stream_read_uint16 (GDataInputStream *stream,
GCancellable *cancellable,
GError **error)
GCancellable *cancellable,
GError **error)
{
guint16 v;
@ -453,8 +454,8 @@ g_data_input_stream_read_uint16 (GDataInputStream *stream,
**/
gint32
g_data_input_stream_read_int32 (GDataInputStream *stream,
GCancellable *cancellable,
GError **error)
GCancellable *cancellable,
GError **error)
{
gint32 v;
@ -501,8 +502,8 @@ g_data_input_stream_read_int32 (GDataInputStream *stream,
**/
guint32
g_data_input_stream_read_uint32 (GDataInputStream *stream,
GCancellable *cancellable,
GError **error)
GCancellable *cancellable,
GError **error)
{
guint32 v;
@ -736,8 +737,8 @@ scan_for_newline (GDataInputStream *stream,
* triggering the cancellable object from another thread. If the operation
* was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
*
* Returns: a string with the line that was read in. Set @length to
* a #gsize to get the length of the read line. Returns %NULL on an error.
* Returns: a string with the line that was read in (including the newlines).
* Set @length to a #gsize to get the length of the read line. Returns %NULL on an error.
**/
char *
g_data_input_stream_read_line (GDataInputStream *stream,

2
gio/gdatainputstream.h
View File

@ -87,7 +87,7 @@ typedef enum {
* @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: Selects any line ending type.
* @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.
**/

20
gio/gdesktopappinfo.c
View File

@ -252,9 +252,9 @@ g_desktop_app_info_new_from_filename (const char *filename)
/**
* g_desktop_app_info_new:
* @desktop_id:
* @desktop_id: the desktop file id
*
* Returns: a new #GDesktopAppInfo.
* Returns: a new #GDesktopAppInfo, or %NULL if no desktop file with that id
**/
GDesktopAppInfo *
g_desktop_app_info_new (const char *desktop_id)
@ -375,8 +375,11 @@ g_desktop_app_info_get_name (GAppInfo *appinfo)
/**
* g_desktop_app_info_get_is_hidden:
* @info:
*
* @info: a #GDesktopAppInfo.
*
* A desktop file is hidden if the Hidden key in it is
* set to True.
*
* Returns: %TRUE if hidden, %FALSE otherwise.
**/
gboolean
@ -909,14 +912,6 @@ g_desktop_app_info_supports_uris (GAppInfo *appinfo)
(strstr (info->exec, "%U") != NULL);
}
static gboolean
g_desktop_app_info_supports_xdg_startup_notify (GAppInfo *appinfo)
{
GDesktopAppInfo *info = G_DESKTOP_APP_INFO (appinfo);
return info->startup_notify;
}
static gboolean
g_desktop_app_info_launch_uris (GAppInfo *appinfo,
GList *uris,
@ -1462,7 +1457,6 @@ g_desktop_app_info_iface_init (GAppInfoIface *iface)
iface->get_icon = g_desktop_app_info_get_icon;
iface->launch = g_desktop_app_info_launch;
iface->supports_uris = g_desktop_app_info_supports_uris;
iface->supports_xdg_startup_notify = g_desktop_app_info_supports_xdg_startup_notify;
iface->launch_uris = g_desktop_app_info_launch_uris;
iface->should_show = g_desktop_app_info_should_show;
iface->set_as_default_for_type = g_desktop_app_info_set_as_default_for_type;

13
gio/gdirectorymonitor.c
View File

@ -36,7 +36,7 @@
* @short_description: Directory Monitor
* @see_also: #GFileMonitor
*
* Monitors a directory for changes.
* Monitors a directory for changes to files in it.
*
**/
@ -236,7 +236,10 @@ g_directory_monitor_init (GDirectoryMonitor *monitor)
* g_directory_monitor_cancel:
* @monitor: a #GDirectoryMonitor.
*
* Cancels the monitoring activity on @monitor.
* Cancels the monitoring activity on @monitor. Note that
* the monitor is automatically cancelled when finalized.
*
* It is safe to call this multiple times.
*
* Returns: %TRUE if the monitor was cancelled successfully. %FALSE otherwise.
**/
@ -260,11 +263,9 @@ g_directory_monitor_cancel (GDirectoryMonitor *monitor)
/**
* g_directory_monitor_set_rate_limit:
* @monitor: a #GDirectoryMonitor.
* @limit_msecs: an integer to set the limit of the directory monitor
* in milliseconds.
* @limit_msecs: the change rate limit of the directory monitor in milliseconds.
*
* Sets the limit of the directory monitor to watch for changes every
* @limit_msecs milliseconds.
* Report same consecutive changes of the same type at most once each @limit_msecs milliseconds.
**/
void
g_directory_monitor_set_rate_limit (GDirectoryMonitor *monitor,

658
gio/gfile.c
View File

File diff suppressed because it is too large Load Diff

5
gio/gfile.h
View File

@ -44,6 +44,7 @@ G_BEGIN_DECLS
* Flags used when querying a #GFileInfo.
*/
typedef enum {
G_FILE_QUERY_INFO_FLAGS_NONE = 0,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS = (1<<0) /*< nick=nofollow-symlinks >*/
} GFileQueryInfoFlags;
@ -64,9 +65,9 @@ typedef enum {
* GFileCopyFlags:
* @G_FILE_COPY_FLAGS_NONE: No flags set.
* @G_FILE_COPY_OVERWRITE: Overwrite any existing files
* @G_FILE_COPY_BACKUP: Make a backup of any existing files. TODO: explain backup naming scheme.
* @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 (see #GFileInfo).
* @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.

19
gio/gfileattribute.c
View File

@ -39,8 +39,8 @@
*
* Keys are strings that contain a key namespace and a key name, separated
* by a colon, e.g. "namespace:keyname". Namespaces are included to sort
* key-value pairs by namespaces for relevance. Keys can be searched
* for using wildcards, e.g. "std:*" will return all of the keys in the
* key-value pairs by namespaces for relevance. Keys can be retrived
* using wildcards, e.g. "std:*" will return all of the keys in the
* "std" namespace.
*
* Values are stored within the list in #GFileAttributeValue structures.
@ -48,16 +48,14 @@
* Upon creation of a #GFileAttributeValue, the type will be set to
* %G_FILE_ATTRIBUTE_TYPE_INVALID.
*
* The Key-value list is stored within the #GFile structure as a
* #GFileAttributeInfoList. This list is queryable by key names
* The list of possible attributes for a filesystem (pointed to by a #GFile) is
* availible as a #GFileAttributeInfoList. This list is queryable by key names
* as indicated earlier.
*
* Classes that implement #GFileIface will create a #GFileAttributeInfoList and
* install default keys and values for their given file system, architecture,
* and other possible implementation details (e.g., on a UNIX system, a file
* attribute key will be registered for the user id for a given file). Other
* attributes can be appended to a #GFileAttributeList later by
* g_file_attribute_info_list_add().
* attribute key will be registered for the user id for a given file).
*
* <para>
* <table>
@ -83,7 +81,7 @@
* NTFS ACLs in Windows should be mapped to these values.</entry></row>
* <row><entry>"mountable"</entry><entry>The "Mountable" namespace. Includes
* simple boolean keys for checking if a file or path supports mount operations, e.g.
* mount, unmount, eject.</entry></row>
* mount, unmount, eject. These are used for files of type %G_FILE_TYPE_MOUNTABLE.</entry></row>
* <row><entry>"time"</entry><entry>The "Time" namespace. Includes file
* access, changed, created times. </entry></row>
* <row><entry>"unix"</entry><entry>The "Unix" namespace. Includes UNIX-specific
@ -95,11 +93,12 @@
* for checking if a file is marked as an archive file.</entry></row>
* <row><entry>"owner"</entry><entry>The "Owner" namespace. Includes information
* about who owns a file. May not be available for all file systems. Examples include
* "user" for getting the user name of the file owner.</entry></row>
* "user" for getting the user name of the file owner. This information is often mapped from
* some backend specific data such as a unix UID.</entry></row>
* <row><entry>"thumbnail"</entry><entry>The "Thumbnail" namespace. Includes
* information about file thumbnails and their location within the file system. Exaples of
* keys in this namespace include "path" to get the location of a thumbnail, and "failed"
* to check if thumbnailing failed.</entry></row>
* to check if thumbnailing of the file failed.</entry></row>
* <row><entry>"fs"</entry><entry>The "Filesystem" namespace. Gets information
* about the file system where a file is located, such as its type, how much
* space is left available, and the overall size of the file system.</entry></row>

10
gio/gfileattribute.h
View File

@ -30,7 +30,7 @@ G_BEGIN_DECLS
/**
* GFileAttributeType:
* @G_FILE_ATTRIBUTE_TYPE_INVALID: indicates an invalid or uninitalized type.
* @G_FILE_ATTRIBUTE_TYPE_STRING: a null terminated C string.
* @G_FILE_ATTRIBUTE_TYPE_STRING: a null terminated UTF8 string.
* @G_FILE_ATTRIBUTE_TYPE_BYTE_STRING: a zero terminated string of non-zero bytes.
* @G_FILE_ATTRIBUTE_TYPE_BOOLEAN: a boolean value.
* @G_FILE_ATTRIBUTE_TYPE_UINT32: an unsigned 4-byte/32-bit integer.
@ -59,7 +59,7 @@ typedef enum {
* @G_FILE_ATTRIBUTE_FLAGS_COPY_WITH_FILE: copy the attribute values when the file is copied.
* @G_FILE_ATTRIBUTE_FLAGS_COPY_WHEN_MOVED: copy the attribute values when the file is moved.
*
* Indicates how to transfer file attributes to new #GFile structures when they are copied.
* A flag specifying the behaviour of an attribute.
**/
typedef enum {
G_FILE_ATTRIBUTE_FLAGS_NONE = 0,
@ -107,11 +107,11 @@ typedef struct {
/**
* GFileAttributeInfo:
* @name: a string containing the key's name.
* @type: a #GFileAttributeType for the key.
* @name: the name of the attribute.
* @type: the #GFileAttributeType type of the attribute.
* @flags: a set of #GFileAttributeFlags.
*
* A Key-Value pair definition.
* Information about a specific attribute.
**/
typedef struct {
char *name;

5
gio/gfileicon.c
View File

@ -29,11 +29,12 @@
/**
* SECTION:gfileicon
* @short_description: Icons for given files
* @short_description: Icons pointing to an image file
* @see_also: #GIcon, #GLoadableIcon
* @include: gio/gfileicon.h
*
* #GFileIcon gets the default icon for a #GFile.
* #GFileIcon specifies an icon by pointing to an image file
* to be used as icon.
*
**/

2
gio/gfileicon.h
View File

@ -38,7 +38,7 @@ G_BEGIN_DECLS
/**
* GFileIcon:
*
* Gets an icon for a #GFile. Implements #GLoadabeIcon.
* Gets an icon for a #GFile. Implements #GLoadableIcon.
**/
typedef struct _GFileIcon GFileIcon;
typedef struct _GFileIconClass GFileIconClass;

49
gio/gfileinfo.h
View File

@ -106,6 +106,8 @@ typedef enum {
* G_FILE_ATTRIBUTE_STD_IS_SYMLINK:
*
* A key in the "std" namespace for checking if the file is a symlink.
* Typically the actual type is something else, if we followed the symlink
* to get the type.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
#define G_FILE_ATTRIBUTE_STD_IS_SYMLINK "std:is_symlink" /* boolean */
@ -122,6 +124,10 @@ typedef enum {
* G_FILE_ATTRIBUTE_STD_NAME:
*
* A key in the "std" namespace for getting the name of the file.
* The name is the on-disk filename which may not be in any known encoding,
* and can thus not be generally displayed as is.
* Use #G_FILE_ATTRIBUTE_STD_DISPLAY_NAME if you need to display the
* name in a user interface.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BYTE_STRING.
**/
#define G_FILE_ATTRIBUTE_STD_NAME "std:name" /* byte string */
@ -130,6 +136,8 @@ typedef enum {
* G_FILE_ATTRIBUTE_STD_DISPLAY_NAME:
*
* A key in the "std" namespace for getting the display name of the file.
* A display name is guaranteed to be in UTF8 and can thus be displayed in
* the UI.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
#define G_FILE_ATTRIBUTE_STD_DISPLAY_NAME "std:display_name" /* string */
@ -138,6 +146,11 @@ typedef enum {
* G_FILE_ATTRIBUTE_STD_EDIT_NAME:
*
* A key in the "std" namespace for edit name of the file.
* An edit name is similar to the display name, but it is meant to be
* used when you want to rename the file in the UI. The display name
* might contain information you don't want in the new filename (such as
* "(invalid unicode)" if the filename was in an invalid encoding).
*
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
#define G_FILE_ATTRIBUTE_STD_EDIT_NAME "std:edit_name" /* string */
@ -146,6 +159,12 @@ typedef enum {
* G_FILE_ATTRIBUTE_STD_COPY_NAME:
*
* A key in the "std" namespace for getting the copy name of the file.
* The copy name is an optional version of the name. If availible its always
* in UTF8, and corresponds directly to the original filename (only transcoded to
* UTF8). This is useful if you want to copy the file to another filesystem that
* might have a different encoding. If the filename is not a valid string in the
* encoding selected for the filesystem it is in then the copy name will not be set.
*
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
#define G_FILE_ATTRIBUTE_STD_COPY_NAME "std:copy_name" /* string */
@ -172,6 +191,9 @@ typedef enum {
* G_FILE_ATTRIBUTE_STD_FAST_CONTENT_TYPE:
*
* A key in the "std" namespace for getting the fast content type.
* The fast content type isn't as reliable as the regular one, as it
* only uses the filename to guess it, but it is faster to calculate than the
* regular content type.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
*
**/
@ -180,7 +202,7 @@ typedef enum {
/**
* G_FILE_ATTRIBUTE_STD_SIZE:
*
* A key in the "std" namespace for getting the file's size.
* A key in the "std" namespace for getting the file's size (in bytes).
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_UINT64.
**/
#define G_FILE_ATTRIBUTE_STD_SIZE "std:size" /* uint64 */
@ -197,7 +219,8 @@ typedef enum {
/**
* G_FILE_ATTRIBUTE_STD_TARGET_URI:
*
* A key in the "std" namespace for getting the target URI for the file.
* A key in the "std" namespace for getting the target URI for the file, in
* the case of %G_FILE_TYPE_SHORTCUT or %G_FILE_TYPE_MOUNTABLE files.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
#define G_FILE_ATTRIBUTE_STD_TARGET_URI "std:target_uri" /* string */
@ -208,7 +231,9 @@ typedef enum {
* A key in the "std" namespace for setting the sort order of a file.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_INT32.
* An example use would be in file managers, which would use this key
* to set the order files are displayed.
* to set the order files are displayed. Files with smaller sort order
* should be sorted first, and files without sort order as if sort order
* was zero.
**/
#define G_FILE_ATTRIBUTE_STD_SORT_ORDER "std:sort_order" /* int32 */
@ -290,8 +315,8 @@ typedef enum {
*
* A key in the "access" namespace for checking trashing privileges.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
* This attribute will be %TRUE if the user is able to send the file to
* the virtual file system trash location.
* This attribute will be %TRUE if the user is able to move the file to
* the trash.
**/
#define G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH "access:can_trash" /* boolean */
@ -311,7 +336,7 @@ typedef enum {
/**
* G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT:
*
* A key in the "mountable" namespace for checking if a file is mountable.
* A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) is mountable.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT "mountable:can_mount" /* boolean */
@ -319,7 +344,7 @@ typedef enum {
/**
* G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT:
*
* A key in the "mountable" namespace for checking if a file is unmountable.
* A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) is unmountable.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT "mountable:can_unmount" /* boolean */
@ -327,7 +352,7 @@ typedef enum {
/**
* G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT:
*
* A key in the "mountable" namespace for checking if a file can be ejected.
* A key in the "mountable" namespace for checking if a file (of type G_FILE_TYPE_MOUNTABLE) can be ejected.
* Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_BOOLEAN.
**/
#define G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT "mountable:can_eject" /* boolean */
@ -343,7 +368,7 @@ typedef enum {
/**
* G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI:
*
* A key in the "mountable" namespace for getting the HAL UDI for the mounted
* A key in the "mountable" namespace for getting the HAL UDI for the mountable
* file. Corresponding #GFileAttributeType is %G_FILE_ATTRIBUTE_TYPE_STRING.
**/
#define G_FILE_ATTRIBUTE_MOUNTABLE_HAL_UDI "mountable:hal_udi" /* string */
@ -603,8 +628,8 @@ typedef enum {
/**
* G_FILE_ATTRIBUTE_FS_SIZE:
*
* A key in the "fs" namespace for getting the size of the file system,
* used in g_file_get_filesystem_info(). Corresponding #GFileAttributeType
* A key in the "fs" namespace for getting the total size (in bytes) of the file system,
* used in g_file_query_filesystem_info(). Corresponding #GFileAttributeType
* is %G_FILE_ATTRIBUTE_TYPE_UINT64.
**/
#define G_FILE_ATTRIBUTE_FS_SIZE "fs:size" /* uint64 */
@ -612,7 +637,7 @@ typedef enum {
/**
* G_FILE_ATTRIBUTE_FS_FREE:
*
* A key in the "fs" namespace for getting the free space left on the
* A key in the "fs" namespace for getting the number of bytes of free space left on the
* file system. Corresponding #GFileAttributeType is
* %G_FILE_ATTRIBUTE_TYPE_UINT64.
**/

6
gio/gfileinputstream.h
View File

@ -37,9 +37,11 @@ G_BEGIN_DECLS
/**
* GFileInputStream:
* @parent: the parent #GInputStream instance.
*
* Implements #GInputStream and #GSeekable for file input operations.
* A subclass of GInputStream for opened files. This adds
* a few file-specific operations and seeking.
*
* #GFileInputStream implements #GSeekable.
**/
typedef struct _GFileInputStream GFileInputStream;
typedef struct _GFileInputStreamClass GFileInputStreamClass;

4
gio/gfilemonitor.c
View File

@ -269,8 +269,8 @@ g_file_monitor_cancel (GFileMonitor* monitor)
* @limit_msecs: a integer with the limit in milliseconds to
* poll for changes.
*
* Sets the rate limit to which the @monitor will poll for changes
* on the device.
* Sets the rate limit to which the @monitor will report
* consecutive change events to the same file.
*
**/
void

18
gio/gfilemonitor.h
View File

@ -37,15 +37,15 @@ G_BEGIN_DECLS
/**
* GFileMonitorEvent:
* @G_FILE_MONITOR_EVENT_CHANGED: Monitor file changed events.
* @G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: Monitor file changed done events.
* @G_FILE_MONITOR_EVENT_DELETED: Monitors file deleted events.
* @G_FILE_MONITOR_EVENT_CREATED: Monitors file created events.
* @G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: Monitors file attribute changed events.
* @G_FILE_MONITOR_EVENT_PRE_UNMOUNT: Monitors pre-unmount events.
* @G_FILE_MONITOR_EVENT_UNMOUNTED: Monitors unmount events.
* @G_FILE_MONITOR_EVENT_CHANGED: a file changed.
* @G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: a hint that this was probably the last change in a set of changes.
* @G_FILE_MONITOR_EVENT_DELETED: a file was deleted.
* @G_FILE_MONITOR_EVENT_CREATED: a file was created.
* @G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: a file attribute was changed.
* @G_FILE_MONITOR_EVENT_PRE_UNMOUNT: the file location will soon be unmounted.
* @G_FILE_MONITOR_EVENT_UNMOUNTED: the file location was be unmounted.
*
* Flags used when creating a #GFileMonitor to define what events to monitor for.
* Specifies what type of event a monitor event is.
**/
typedef enum {
G_FILE_MONITOR_EVENT_CHANGED,
@ -63,7 +63,7 @@ typedef struct _GFileMonitorPrivate GFileMonitorPrivate;
/**
* GFileMonitor:
*
* Watches for changes within a #GFile.
* Watches for changes to a file.
**/
struct _GFileMonitor
{

4
gio/gfileoutputstream.c
View File

@ -263,7 +263,9 @@ g_file_output_stream_query_info_finish (GFileOutputStream *stream,
* g_file_output_stream_get_etag:
* @stream: a #GFileOutputStream.
*
* Gets the entity tag for the file output stream.
* Gets the entity tag for the file when its been written.
* This must be called after the stream has been written
* and closed. As the etag can change while writing.
*
* Returns: the entity tag for the stream.
**/

6
gio/gfileoutputstream.h
View File

@ -37,9 +37,11 @@ G_BEGIN_DECLS
/**
* GFileOutputStream:
* @parent: The parent #GOutputStream instance.
*
* Implements #GOutputStream and #GSeekable for file output operations.
* A subclass of GOutputStream for opened files. This adds
* a few file-specific operations and seeking and truncating.
*
* #GFileOutputStream implements GSeekable.
**/
typedef struct _GFileOutputStream GFileOutputStream;
typedef struct _GFileOutputStreamClass GFileOutputStreamClass;

2
gio/gfilterinputstream.h
View File

@ -38,7 +38,7 @@ G_BEGIN_DECLS
/**
* GFilterInputStream:
*
* Filtered input streams. Implements #GInputStream.
* A base class for all input streams that work on an underlying stream.
**/
typedef struct _GFilterInputStream GFilterInputStream;
typedef struct _GFilterInputStreamClass GFilterInputStreamClass;

2
gio/gfilteroutputstream.h
View File

@ -38,7 +38,7 @@ G_BEGIN_DECLS
/**
* GFilterOutputStream:
*
* Filtered output streams. Implements #GOutputStream.
* A base class for all output streams that work on an underlying stream.
**/
typedef struct _GFilterOutputStream GFilterOutputStream;
typedef struct _GFilterOutputStreamClass GFilterOutputStreamClass;

4
gio/gicon.h
View File

@ -35,7 +35,7 @@ G_BEGIN_DECLS
/**
* GIcon:
*
* Icons for file, content, drive and volume types.
* An abstract type that specifies an icon.
**/
typedef struct _GIcon GIcon; /* Dummy typedef */
typedef struct _GIconIface GIconIface;
@ -48,7 +48,7 @@ typedef struct _GIconIface GIconIface;
*
* GIconIface is used to implement GIcon types for various
* different systems. See #GThemedIcon and #GLoadableIcon for
* examples of how to use this interface.
* examples of how to implement this interface.
*/
struct _GIconIface
{

6
gio/gioscheduler.c
View File

@ -329,12 +329,12 @@ mainloop_proxy_notify (gpointer data)
/**
* g_io_job_send_to_mainloop:
* @job: a #GIOJob.
* @func: a #GIODataFunc.
* @func: a #GIODataFunc callback that will be called the main thread.
* @user_data: a #gpointer.
* @notify: a #GDestroyNotify.
* @block: boolean flag indicating whether or not this job should block.
* @block: boolean flag indicating whether or not the job should block until the callback has returned.
*
* Sends an I/O job to the application's main loop for processing.
* Sends a notification from an I/O job to the mainloop processing on the main thread.
**/
void
g_io_job_send_to_mainloop (GIOJob *job,

2
gio/gloadableicon.c
View File

@ -32,7 +32,7 @@
* @short_description: Loadable Icons
* @see_also: #GIcon, #GThemedIcon
*
* Extends the #GIcon interface and adds the ability to load icons.
* Extends the #GIcon interface and adds the ability to load icons from streams.
**/
static void g_loadable_icon_real_load_async (GLoadableIcon *icon,

4
gio/gloadableicon.h
View File

@ -37,7 +37,7 @@ G_BEGIN_DECLS
/**
* GLoadableIcon:
*
* Dummy type for subclassing loadable icon types.
* Generic interface for all kinds of icons that can be loaded as a stream to an image file.
**/
typedef struct _GLoadableIcon GLoadableIcon; /* Dummy typedef */
typedef struct _GLoadableIconIface GLoadableIconIface;
@ -49,8 +49,6 @@ typedef struct _GLoadableIconIface GLoadableIconIface;
* @load_async: Loads an icon asynchronously.
* @load_finish: Finishes an asynchronous icon load.
*
* GLoadableIconIface is used for implementing loadable icon types,
* for implementations that need to load an icon.
**/
struct _GLoadableIconIface
{

124
gio/glocalfileinfo.c
View File

@ -1288,70 +1288,70 @@ win32_get_file_user_info (const gchar* filename,
sd_size,
&sd_size))
{
PSID psid = 0;
PSID psid = 0;
BOOL defaulted;
SID_NAME_USE name_use = 0; /* don't care? */
wchar_t *name = NULL;
wchar_t *domain = NULL;
DWORD name_len = 0;
DWORD domain_len = 0;
/* get the user name */
do {
if (!user_name)
break;
if (!GetSecurityDescriptorOwner (psd, &psid, &defaulted))
break;
if (!LookupAccountSidW (NULL, /* local machine */
psid,
name, &name_len,
domain, &domain_len, /* no domain info yet */
&name_use) && (ERROR_INSUFFICIENT_BUFFER != GetLastError()))
break;
name = g_try_malloc (name_len*sizeof(wchar_t));
domain = g_try_malloc (domain_len*sizeof(wchar_t));
if (name && domain &&
LookupAccountSidW (NULL, /* local machine */
psid,
name, &name_len,
domain, &domain_len, /* no domain info yet */
&name_use))
{
*user_name = g_utf16_to_utf8 (name, -1, NULL, NULL, NULL);
}
g_free (name);
g_free (domain);
} while (FALSE);
/* get the group name */
do {
if (!group_name)
break;
if (!GetSecurityDescriptorGroup (psd, &psid, &defaulted))
break;
if (!LookupAccountSidW (NULL, /* local machine */
psid,
name, &name_len,
domain, &domain_len, /* no domain info yet */
&name_use) && (ERROR_INSUFFICIENT_BUFFER != GetLastError()))
break;
name = g_try_malloc (name_len*sizeof(wchar_t));
domain = g_try_malloc (domain_len*sizeof(wchar_t));
if (name && domain &&
LookupAccountSidW (NULL, /* local machine */
psid,
name, &name_len,
domain, &domain_len, /* no domain info yet */
&name_use))
{
*group_name = g_utf16_to_utf8 (name, -1, NULL, NULL, NULL);
}
g_free (name);
g_free (domain);
} while (FALSE);
/* TODO: get real name */
g_free (psd);
wchar_t *name = NULL;
wchar_t *domain = NULL;
DWORD name_len = 0;
DWORD domain_len = 0;
/* get the user name */
do {
if (!user_name)
break;
if (!GetSecurityDescriptorOwner (psd, &psid, &defaulted))
break;
if (!LookupAccountSidW (NULL, /* local machine */
psid,
name, &name_len,
domain, &domain_len, /* no domain info yet */
&name_use) && (ERROR_INSUFFICIENT_BUFFER != GetLastError()))
break;
name = g_try_malloc (name_len*sizeof(wchar_t));
domain = g_try_malloc (domain_len*sizeof(wchar_t));
if (name && domain &&
LookupAccountSidW (NULL, /* local machine */
psid,
name, &name_len,
domain, &domain_len, /* no domain info yet */
&name_use))
{
*user_name = g_utf16_to_utf8 (name, -1, NULL, NULL, NULL);
}
g_free (name);
g_free (domain);
} while (FALSE);
/* get the group name */
do {
if (!group_name)
break;
if (!GetSecurityDescriptorGroup (psd, &psid, &defaulted))
break;
if (!LookupAccountSidW (NULL, /* local machine */
psid,
name, &name_len,
domain, &domain_len, /* no domain info yet */
&name_use) && (ERROR_INSUFFICIENT_BUFFER != GetLastError()))
break;
name = g_try_malloc (name_len*sizeof(wchar_t));
domain = g_try_malloc (domain_len*sizeof(wchar_t));
if (name && domain &&
LookupAccountSidW (NULL, /* local machine */
psid,
name, &name_len,
domain, &domain_len, /* no domain info yet */
&name_use))
{
*group_name = g_utf16_to_utf8 (name, -1, NULL, NULL, NULL);
}
g_free (name);
g_free (domain);
} while (FALSE);
/* TODO: get real name */
g_free (psd);
}
g_free (wfilename);
}

3
gio/gmemoryinputstream.c
View File

@ -252,8 +252,7 @@ g_memory_input_stream_get_data (GMemoryInputStream *stream)
*
* Gets the size of the data within the #GMemoryInputStream.
*
* Returns: a gsize with the size of the data in @stream, or -1
* on error.
* Returns: a gsize with the size of the data in @stream.
**/
gsize
g_memory_input_stream_get_data_size (GMemoryInputStream *stream)

7
gio/gmountoperation.c
View File

@ -39,11 +39,14 @@
* operations, such as loop mounting files, hard drive partitions or
* server locations.
*
* Mountable GIO backends should implement #GMountOperation if they
* Mountin operations are handed a #GMountOperation that then can use if they
* require any privileges or authentication for their volumes to be
* mounted (e.g. a hard disk partition or an encrypted filesystem), or
* if they are implementing a remote server protocol which requires user
* credentials such as FTP or WebDAV.
* credentials such as FTP or WebDAV.
*
* Users should instantiate a subclass of this that implements all
* the various callbacks to show the required dialogs.
**/
G_DEFINE_TYPE (GMountOperation, g_mount_operation, G_TYPE_OBJECT);

3
gio/gthemedicon.c
View File

@ -35,6 +35,9 @@
* #GThemedIcon contains a list of all of the icons present in an icon
* theme, so that icons can be looked up quickly. #GThemedIcon does
* not provide actual pixmaps for icons, just the icon names.
* Ideally something like gtk_icon_theme_choose_icon() should be used to
* resolve the list of names so that fallback icons work nicely with
* themes that inherit other themes.
**/
static void g_themed_icon_icon_iface_init (GIconIface *iface);