+2007-12-17 Matthias Clasen <mclasen@redhat.com>
+
+ * gio/gio-sections.txt: Updates
+
2007-12-14 Matthias Clasen <mclasen@redhat.com>
* glib/tmpl/hash_tables.sgml:
g_unix_mount_point_is_loopback
g_unix_mount_point_guess_icon
g_unix_mount_point_guess_name
-g_get_unix_mount_points
-g_get_unix_mounts
-g_get_unix_mount_at
+g_unix_mount_points_get
+g_unix_mounts_get
+g_unix_mount_at
g_unix_mounts_changed_since
g_unix_mount_points_changed_since
g_unix_mount_monitor_new
-g_unix_get_canonical_device_path
g_unix_is_mount_path_system_internal
<SUBSECTION Standard>
GUnixMountClass
+2007-12-17 Matthias Clasen <mclasen@redhat.com>
+
+ * gio.symbols:
+ * gunixmounts.[hc]: Namespace waste reduction, move some
+ g_get_unix_mount functions to the g_unix_mount namespace.
+
+ * gunixmounts.c:
+ * gunixvolumemonitor.c:
+ * glocalfile.c:
+ * glocaldirectorymonitor.c: Update all callers.
+
+ * gunixmounts.h: Remove leftover g_unix_get_canonical_device_path
+
2007-12-17 Alexander Larsson <alexl@redhat.com>
* gfile.c:
g_unix_mount_point_is_loopback
g_unix_mount_point_guess_name
g_unix_mount_point_guess_icon
-g_get_unix_mount_points
-g_get_unix_mounts
-g_get_unix_mount_at
+g_unix_mount_points_get
+g_unix_mounts_get
+g_unix_mount_at
g_unix_mounts_changed_since
g_unix_mount_points_changed_since
g_unix_mount_monitor_get_type G_GNUC_CONST
/* Emulate unmount detection */
- mount = g_get_unix_mount_at (local_monitor->dirname, NULL);
+ mount = g_unix_mount_at (local_monitor->dirname, NULL);
local_monitor->was_mounted = mount != NULL;
mount = NULL;
g_warning ("G_OS_WIN32: no mount emulation");
#else
- mount = g_get_unix_mount_at (local_monitor->dirname, NULL);
+ mount = g_unix_mount_at (local_monitor->dirname, NULL);
is_mounted = mount != NULL;
if (mountpoint == NULL)
mountpoint = "/";
- mount = g_get_unix_mount_at (mountpoint, &cache_time);
+ mount = g_unix_mount_at (mountpoint, &cache_time);
if (mount)
{
if (g_unix_mount_is_readonly (mount))
}
/**
- * g_get_unix_mounts:
+ * g_unix_mounts_get:
* @time_read: guint64 to contain a timestamp.
*
* Gets a #GList of strings containing the unix mounts.
* Returns: a #GList of the UNIX mounts.
**/
GList *
-g_get_unix_mounts (guint64 *time_read)
+g_unix_mounts_get (guint64 *time_read)
{
if (time_read)
*time_read = get_mounts_timestamp ();
}
/**
- * g_get_unix_mount_at:
+ * g_unix_mount_at:
* @mount_path: path for a possible unix mount.
* @time_read: guint64 to contain a timestamp.
*
* Returns: a #GUnixMount.
**/
GUnixMountEntry *
-g_get_unix_mount_at (const char *mount_path,
- guint64 *time_read)
+g_unix_mount_at (const char *mount_path,
+ guint64 *time_read)
{
GList *mounts, *l;
GUnixMountEntry *mount_entry, *found;
- mounts = g_get_unix_mounts (time_read);
+ mounts = g_unix_mounts_get (time_read);
found = NULL;
for (l = mounts; l != NULL; l = l->next)
}
/**
- * g_get_unix_mount_points:
+ * g_unix_mount_points_get:
* @time_read: guint64 to contain a timestamp.
*
* Gets a #GList of strings containing the unix mount points.
* Returns: a #GList of the UNIX mountpoints.
**/
GList *
-g_get_unix_mount_points (guint64 *time_read)
+g_unix_mount_points_get (guint64 *time_read)
{
if (time_read)
*time_read = get_mount_points_timestamp ();
/**
* GUnixMountEntry:
*
- * Defines a Unix mount entry (e.g. "/media/cdrom").
+ * Defines a Unix mount entry (e.g. <filename>/media/cdrom</filename>).
+ * This corresponds roughly to a mtab entry.
**/
typedef struct _GUnixMountEntry GUnixMountEntry;
/**
* GUnixMountPoint:
*
- * Defines a Unix mount point (e.g. "/dev").
+ * Defines a Unix mount point (e.g. <filename>/dev</filename>).
+ * This corresponds roughly to a fstab entry.
**/
typedef struct _GUnixMountPoint GUnixMountPoint;
char * g_unix_mount_point_guess_name (GUnixMountPoint *mount_point);
GIcon * g_unix_mount_point_guess_icon (GUnixMountPoint *mount_point);
-GList * g_get_unix_mount_points (guint64 *time_read);
-GList * g_get_unix_mounts (guint64 *time_read);
-GUnixMountEntry * g_get_unix_mount_at (const char *mount_path,
+GList * g_unix_mount_points_get (guint64 *time_read);
+GList * g_unix_mounts_get (guint64 *time_read);
+GUnixMountEntry *g_unix_mount_at (const char *mount_path,
guint64 *time_read);
gboolean g_unix_mounts_changed_since (guint64 time);
gboolean g_unix_mount_points_changed_since (guint64 time);
GType g_unix_mount_monitor_get_type (void) G_GNUC_CONST;
GUnixMountMonitor *g_unix_mount_monitor_new (void);
-
-
-char *g_unix_get_canonical_device_path (const char *device_path);
-
gboolean g_unix_is_mount_path_system_internal (const char *mount_path);
G_END_DECLS
GUnixMountEntry *mount_entry;
GUnixMount *mount;
- mount_entry = g_get_unix_mount_at (mount_path, NULL);
+ mount_entry = g_unix_mount_at (mount_path, NULL);
/* TODO: Set mountable volume? */
mount = _g_unix_mount_new (NULL, mount_entry, NULL);
GList *l;
GUnixVolume *volume;
- new_mountpoints = g_get_unix_mount_points (NULL);
+ new_mountpoints = g_unix_mount_points_get (NULL);
new_mountpoints = g_list_sort (new_mountpoints, (GCompareFunc) g_unix_mount_point_compare);
GUnixVolume *volume;
const char *mount_path;
- new_mounts = g_get_unix_mounts (NULL);
+ new_mounts = g_unix_mounts_get (NULL);
new_mounts = g_list_sort (new_mounts, (GCompareFunc) g_unix_mount_compare);
typedef struct _GUnixVolumeMonitorClass GUnixVolumeMonitorClass;
/* Forward definitions */
+
+/**
+ * GUnixMount:
+ *
+ * Implementation of the #GMount interface for Unix systems.
+ */
typedef struct _GUnixMount GUnixMount;
typedef struct _GUnixVolume GUnixVolume;