3d17b00fc4
- Only automount if media or drive was just inserted - this fixes a problem
with spurious automounts when partitioning/formatting
60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From 3f3f21fe6e2bdac8fd6acf048da6fb228adde092 Mon Sep 17 00:00:00 2001
|
|
From: David Zeuthen <davidz@redhat.com>
|
|
Date: Fri, 01 May 2009 19:59:54 +0000
|
|
Subject: Use new gnome-disk-utility API to figure out when media was inserted
|
|
|
|
This fixes a problem with Nautilus automounting newly created volumes
|
|
appearing as a result of formatting/partitioning.
|
|
---
|
|
diff --git a/monitor/gdu/ggdudrive.c b/monitor/gdu/ggdudrive.c
|
|
index 29e108d..c2c8b76 100644
|
|
--- a/monitor/gdu/ggdudrive.c
|
|
+++ b/monitor/gdu/ggdudrive.c
|
|
@@ -51,7 +51,6 @@ struct _GGduDrive {
|
|
gboolean can_eject;
|
|
gboolean can_poll_for_media;
|
|
gboolean is_media_check_automatic;
|
|
- time_t time_of_last_media_insertion;
|
|
};
|
|
|
|
static void g_gdu_drive_drive_iface_init (GDriveIface *iface);
|
|
@@ -178,9 +177,6 @@ update_drive (GGduDrive *drive)
|
|
if (device != NULL)
|
|
g_object_unref (device);
|
|
|
|
- if (drive->has_media != old_has_media)
|
|
- drive->time_of_last_media_insertion = time (NULL);
|
|
-
|
|
/* compute whether something changed */
|
|
changed = !((old_is_media_removable == drive->is_media_removable) &&
|
|
(old_has_media == drive->has_media) &&
|
|
@@ -233,8 +229,6 @@ g_gdu_drive_new (GVolumeMonitor *volume_monitor,
|
|
|
|
drive->presentable = g_object_ref (presentable);
|
|
|
|
- drive->time_of_last_media_insertion = time (NULL);
|
|
-
|
|
g_signal_connect (drive->presentable, "changed", G_CALLBACK (presentable_changed), drive);
|
|
g_signal_connect (drive->presentable, "job-changed", G_CALLBACK (presentable_job_changed), drive);
|
|
|
|
@@ -685,7 +679,16 @@ g_gdu_drive_has_presentable (GGduDrive *drive,
|
|
time_t
|
|
g_gdu_drive_get_time_of_last_media_insertion (GGduDrive *drive)
|
|
{
|
|
- return drive->time_of_last_media_insertion;
|
|
+ GduDevice *device;
|
|
+ time_t ret;
|
|
+
|
|
+ ret = 0;
|
|
+ device = gdu_presentable_get_device (drive->presentable);
|
|
+ if (device != NULL) {
|
|
+ ret = gdu_device_get_media_detection_time (device);
|
|
+ g_object_unref (device);
|
|
+ }
|
|
+ return ret;
|
|
}
|
|
|
|
GduPresentable *
|
|
--
|
|
cgit v0.8.2
|