Rework how volumes, drives and volume monitoring is done. Previosly the

2007-12-11  David Zeuthen  <davidz@redhat.com>

	Rework how volumes, drives and volume monitoring is
	done. Previosly the model was

	 GDrive <1-1> GVolume

	where a GDrive instance represented a mount point and a GVolume
	instance represented a mounted file system. This patch changes it
	the model to

		GDrive <1-N> GVolume <1-1> GMount

	where GMount now serves the purpose of the old GVolume and the new
	GVolume serves the purpose of the old GDrive. In addition the new
	GDrive interface is used to represent a collection of GVolume
	instances (typically partitions) and also contains utility to query
	the state of the physical drive the GDrive object represents (such
	as checking for media, polling the drive, ejecting the media etc.).

	Also implement mounting and unmounting in the Unix volume monitor
	backend. A subquent patch will introduce GDrive support for ejection
	of media.

	* Makefile.am:
	* gdrive.c: (g_drive_is_media_check_automatic),
	(g_drive_is_media_removable), (g_drive_has_media),
	(g_drive_can_poll_for_media), (g_drive_eject),
	(g_drive_eject_finish), (g_drive_poll_for_media),
	(g_drive_poll_for_media_finish):
	* gdrive.h:
	* gfile.c: (g_file_find_enclosing_mount):
	* gfile.h:
	* gio.symbols:
	* glocaldirectorymonitor.c:
	(g_local_directory_monitor_constructor), (mounts_changed):
	* glocalfile.c: (get_mount_info),
	(g_local_file_find_enclosing_mount),
	(g_local_file_file_iface_init):
	* gnativevolumemonitor.h:
	* gunionvolumemonitor.c: (get_mounts), (get_volumes),
	(get_connected_drives), (g_union_volume_monitor_class_init),
	(child_volume_added), (child_volume_removed),
	(child_volume_changed), (child_mount_added), (child_mount_removed),
	(child_mount_pre_unmount), (child_mount_changed),
	(child_drive_changed), (g_union_volume_monitor_add_monitor),
	(g_union_volume_monitor_remove_monitor),
	(_g_mount_get_for_mount_path):
	* gunixmounts.c: (g_unix_is_mount_path_system_internal),
	(guess_system_internal), (_g_get_unix_mounts),
	(_g_get_unix_mount_points), (g_get_unix_mount_at),
	(g_unix_mount_free), (g_unix_mount_compare),
	(g_unix_mount_get_mount_path), (g_unix_mount_get_device_path),
	(g_unix_mount_get_fs_type), (g_unix_mount_is_readonly),
	(g_unix_mount_is_system_internal), (g_unix_mount_guess_type),
	(type_to_icon), (g_unix_mount_guess_name),
	(g_unix_mount_guess_icon), (g_unix_mount_point_guess_name),
	(g_unix_mount_point_guess_icon), (_canonicalize_filename),
	(_resolve_symlink), (_resolve_dev_root):
	* gunixmounts.h:
	* gunixvolume.c: (g_unix_volume_finalize), (_g_unix_volume_new),
	(_g_unix_volume_disconnected), (_g_unix_volume_set_mount),
	(_g_unix_volume_unset_mount), (g_unix_volume_get_icon),
	(g_unix_volume_get_name), (g_unix_volume_can_mount),
	(g_unix_volume_get_drive), (g_unix_volume_get_mount),
	(_g_unix_volume_has_mount_path), (mount_cb), (mount_read_error),
	(g_unix_volume_mount), (g_unix_volume_mount_finish),
	(g_unix_volume_volume_iface_init):
	* gunixvolume.h:
	* gunixvolumemonitor.c: (g_unix_volume_monitor_finalize),
	(get_mounts), (get_volumes), (get_connected_drives),
	(get_mount_for_mount_path), (g_unix_volume_monitor_class_init),
	(mountpoints_changed), (mounts_changed),
	(g_unix_volume_monitor_init),
	(_g_unix_volume_monitor_lookup_volume_for_mount_path),
	(find_mount_by_mountpath), (update_volumes), (update_mounts):
	* gunixvolumemonitor.h:
	* gvolume.c: (g_volume_get_mount), (g_volume_can_mount),
	(g_volume_mount), (g_volume_mount_finish):
	* gvolume.h:
	* gvolumemonitor.c: (g_volume_monitor_class_init),
	(g_volume_monitor_get_connected_drives),
	(g_volume_monitor_get_volumes), (g_volume_monitor_get_mounts):
	* gvolumemonitor.h:


svn path=/trunk/; revision=6095

gio/gunixmounts.h

@@ -25,15 +25,16 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include <gio/gicon.h>
 
 G_BEGIN_DECLS
 
 /**
- * GUnixMount:
+ * GUnixMountEntry:
  * 
- * Defines a Unix mount.
+ * Defines a Unix mount entry (e.g. "/media/cdrom").
  **/
-typedef struct _GUnixMount GUnixMount;
+typedef struct _GUnixMountEntry GUnixMountEntry;
 
 /**
  * GUnixMountPoint:
@@ -42,40 +43,6 @@ typedef struct _GUnixMount GUnixMount;
  **/
 typedef struct _GUnixMountPoint GUnixMountPoint;
 
-/**
- * GUnixMountType:
- * @G_UNIX_MOUNT_TYPE_UNKNOWN: Unknown UNIX mount type.
- * @G_UNIX_MOUNT_TYPE_FLOPPY: Floppy disk UNIX mount type.
- * @G_UNIX_MOUNT_TYPE_CDROM: CDROM UNIX mount type.
- * @G_UNIX_MOUNT_TYPE_NFS: Network File System (NFS) UNIX mount type.
- * @G_UNIX_MOUNT_TYPE_ZIP: ZIP UNIX mount type.
- * @G_UNIX_MOUNT_TYPE_JAZ: JAZZ UNIX mount type.
- * @G_UNIX_MOUNT_TYPE_MEMSTICK: Memory Stick UNIX mount type.
- * @G_UNIX_MOUNT_TYPE_CF: Compact Flash UNIX mount type.
- * @G_UNIX_MOUNT_TYPE_SM: Smart Media UNIX mount type.
- * @G_UNIX_MOUNT_TYPE_SDMMC: SD/MMC UNIX mount type.
- * @G_UNIX_MOUNT_TYPE_IPOD: iPod UNIX mount type.
- * @G_UNIX_MOUNT_TYPE_CAMERA: Digital camera UNIX mount type.
- * @G_UNIX_MOUNT_TYPE_HD: Hard drive UNIX mount type.
- * 
- * Types of UNIX mounts.
- **/
-typedef enum {
-  G_UNIX_MOUNT_TYPE_UNKNOWN,
-  G_UNIX_MOUNT_TYPE_FLOPPY,
-  G_UNIX_MOUNT_TYPE_CDROM,
-  G_UNIX_MOUNT_TYPE_NFS,
-  G_UNIX_MOUNT_TYPE_ZIP,
-  G_UNIX_MOUNT_TYPE_JAZ,
-  G_UNIX_MOUNT_TYPE_MEMSTICK,
-  G_UNIX_MOUNT_TYPE_CF,
-  G_UNIX_MOUNT_TYPE_SM,
-  G_UNIX_MOUNT_TYPE_SDMMC,
-  G_UNIX_MOUNT_TYPE_IPOD,
-  G_UNIX_MOUNT_TYPE_CAMERA,
-  G_UNIX_MOUNT_TYPE_HD
-} GUnixMountType;
-
 /**
  * GUnixMountMonitor:
  * 
@@ -90,16 +57,17 @@ typedef struct _GUnixMountMonitorClass GUnixMountMonitorClass;
 #define G_IS_UNIX_MOUNT_MONITOR(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), G_TYPE_UNIX_MOUNT_MONITOR))
 #define G_IS_UNIX_MOUNT_MONITOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), G_TYPE_UNIX_MOUNT_MONITOR))
 
-void           g_unix_mount_free                    (GUnixMount         *mount_entry);
+void           g_unix_mount_free                    (GUnixMountEntry    *mount_entry);
 void           g_unix_mount_point_free              (GUnixMountPoint    *mount_point);
-gint           g_unix_mount_compare                 (GUnixMount         *mount1,
-						     GUnixMount         *mount2);
-const char *   g_unix_mount_get_mount_path          (GUnixMount         *mount_entry);
-const char *   g_unix_mount_get_device_path         (GUnixMount         *mount_entry);
-const char *   g_unix_mount_get_fs_type             (GUnixMount         *mount_entry);
-gboolean       g_unix_mount_is_readonly             (GUnixMount         *mount_entry);
-gboolean       g_unix_mount_is_system_internal      (GUnixMount         *mount_entry);
-GUnixMountType g_unix_mount_guess_type              (GUnixMount         *mount_entry);
+gint           g_unix_mount_compare                 (GUnixMountEntry    *mount1,
+						     GUnixMountEntry    *mount2);
+const char *   g_unix_mount_get_mount_path          (GUnixMountEntry    *mount_entry);
+const char *   g_unix_mount_get_device_path         (GUnixMountEntry    *mount_entry);
+const char *   g_unix_mount_get_fs_type             (GUnixMountEntry    *mount_entry);
+gboolean       g_unix_mount_is_readonly             (GUnixMountEntry    *mount_entry);
+gboolean       g_unix_mount_is_system_internal      (GUnixMountEntry    *mount_entry);
+char *         g_unix_mount_guess_name              (GUnixMountEntry    *mount_entry);
+GIcon *        g_unix_mount_guess_icon              (GUnixMountEntry    *mount_entry);
 
 gint           g_unix_mount_point_compare           (GUnixMountPoint    *mount1,
 						     GUnixMountPoint    *mount2);
@@ -109,11 +77,12 @@ const char *   g_unix_mount_point_get_fs_type       (GUnixMountPoint    *mount_p
 gboolean       g_unix_mount_point_is_readonly       (GUnixMountPoint    *mount_point);
 gboolean       g_unix_mount_point_is_user_mountable (GUnixMountPoint    *mount_point);
 gboolean       g_unix_mount_point_is_loopback       (GUnixMountPoint    *mount_point);
-GUnixMountType g_unix_mount_point_guess_type        (GUnixMountPoint    *mount_point);
+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);
-GUnixMount *   g_get_unix_mount_at                  (const char         *mount_path,
+GUnixMountEntry * g_get_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);
@@ -121,6 +90,12 @@ 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
 
 #endif /* __G_UNIX_MOUNTS_H__ */