luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-12 23:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add g_file_monitor

Browse Source 
svn path=/trunk/; revision=7145
This commit is contained in:
Matthias Clasen 2008-07-02 17:19:16 +00:00
parent 563eb12748
commit d19e08a40c
6 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/ChangeLog
View File

@ -1,6 +1,7 @@
2008-07-02 Matthias Clasen <mclasen@redhat.com> 2008-07-02 Matthias Clasen <mclasen@redhat.com>
* gio/gio-sections.txt: Add g_desktop_app_info_new_from_keyfile * gio/gio-sections.txt: Add g_desktop_app_info_new_from_keyfile
and g_file_monitor
2008-07-01 Matthias Clasen <mclasen@redhat.com> 2008-07-01 Matthias Clasen <mclasen@redhat.com>

1
docs/reference/gio/gio-sections.txt
View File

@ -115,6 +115,7 @@ g_file_mount_enclosing_volume
g_file_mount_enclosing_volume_finish g_file_mount_enclosing_volume_finish
g_file_monitor_directory g_file_monitor_directory
g_file_monitor_file g_file_monitor_file
g_file_monitor
g_file_load_contents g_file_load_contents
g_file_load_contents_async g_file_load_contents_async
g_file_load_contents_finish g_file_load_contents_finish

8
gio/ChangeLog
View File

@ -1,3 +1,11 @@
2008-07-02 Matthias Clasen <mclasen@redhat.com>
Bug 536160 – Add g_file_monitor()
* gio.symbols:
* gfile.[hc]: Add g_file_monitor which can return either
a file or a directory monitor. Proposed by Behdad Esfahbod
2008-07-02 Matthias Clasen <mclasen@redhat.com> 2008-07-02 Matthias Clasen <mclasen@redhat.com>
536733 – gio build failure on Irix 536733 – gio build failure on Irix

30
gio/gfile.c
View File

@ -3896,6 +3896,36 @@ g_file_monitor_file (GFile *file,
return monitor; return monitor;
} }
/**
* g_file_monitor:
* @file: input #GFile
* @flags: a set of #GFileMonitorFlags
* @cancellable: optional #GCancellable object, %NULL to ignore
* @error: a #GError, or %NULL
*
* Obtains a file or directory monitor for the given file, depending
* on the type of the file.
*
* If @cancellable is not %NULL, then the operation can be cancelled by
* triggering the cancellable object from another thread. If the operation
* was cancelled, the error %G_IO_ERROR_CANCELLED will be returned.
*
* Returns: a #GFileMonitor for the given @file.
*
* Since: 2.18
*/
GFileMonitor*
g_file_monitor (GFile *file,
GFileMonitorFlags flags,
GCancellable *cancellable,
GError **error)
{
if (g_file_query_file_type (file, 0, cancellable) == G_FILE_TYPE_DIRECTORY)
return g_file_monitor_directory (file, flags, cancellable, error);
else
return g_file_monitor_file (file, flags, cancellable, error);
}
/******************************************** /********************************************
* Default implementation of async ops * * Default implementation of async ops *
********************************************/ ********************************************/

4
gio/gfile.h
View File

@ -749,6 +749,10 @@ GFileMonitor* g_file_monitor_file (GFile
GFileMonitorFlags flags, GFileMonitorFlags flags,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
GFileMonitor* g_file_monitor (GFile *file,
GFileMonitorFlags flags,
GCancellable *cancellable,
GError **error);
/* Utilities */ /* Utilities */

1
gio/gio.symbols
View File

@ -300,6 +300,7 @@ g_file_eject_mountable_finish
g_file_copy_attributes g_file_copy_attributes
g_file_monitor_directory g_file_monitor_directory
g_file_monitor_file g_file_monitor_file
g_file_monitor
g_file_query_default_handler g_file_query_default_handler
g_file_load_contents g_file_load_contents
g_file_load_contents_async g_file_load_contents_async