summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarin Adler <darin@src.gnome.org>2001-09-15 00:35:56 +0000
committerDarin Adler <darin@src.gnome.org>2001-09-15 00:35:56 +0000
commite8362fdc0a2a2282131a43b4c4a6c5cdd5d928e6 (patch)
tree316da175ed9a45b1f56c3e7377440a3029505cdc
parent9f3b8544c32c85de9cf5cbab531e5e0e7c97e637 (diff)
downloadnautilus-e8362fdc0a2a2282131a43b4c4a6c5cdd5d928e6.tar.gz
Move inside #ifdef HAVE_FAM.
* libnautilus-private/nautilus-monitor.c: (path_is_on_readonly_volume): Move inside #ifdef HAVE_FAM.
-rw-r--r--ChangeLog5
-rw-r--r--libnautilus-private/nautilus-monitor.c22
2 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 85d33710f..b7e105a49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-14 Darin Adler <darin@bentspoon.com>
+
+ * libnautilus-private/nautilus-monitor.c:
+ (path_is_on_readonly_volume): Move inside #ifdef HAVE_FAM.
+
2001-09-05 Alex Larsson <alexl@redhat.com>
Merge some stuff from the redhat-outstanding-patches branch
diff --git a/libnautilus-private/nautilus-monitor.c b/libnautilus-private/nautilus-monitor.c
index 3ff006795..b08be54e8 100644
--- a/libnautilus-private/nautilus-monitor.c
+++ b/libnautilus-private/nautilus-monitor.c
@@ -221,6 +221,17 @@ process_fam_notifications (GIOChannel *channel,
return TRUE;
}
+static gboolean
+path_is_on_readonly_volume (const char *path)
+{
+ NautilusVolumeMonitor *volume_monitor;
+ NautilusVolume *volume;
+
+ volume_monitor = nautilus_volume_monitor_get ();
+ volume = nautilus_volume_monitor_get_volume_for_path (volume_monitor, path);
+ return (volume != NULL) && nautilus_volume_is_read_only (volume);
+}
+
#endif /* HAVE_LIBFAM */
gboolean
@@ -233,17 +244,6 @@ nautilus_monitor_active (void)
#endif
}
-static gboolean
-path_is_on_readonly_volume (const char *path)
-{
- NautilusVolumeMonitor *volume_monitor;
- NautilusVolume *volume;
-
- volume_monitor = nautilus_volume_monitor_get ();
- volume = nautilus_volume_monitor_get_volume_for_path (volume_monitor, path);
- return (volume != NULL) && nautilus_volume_is_read_only (volume);
-}
-
NautilusMonitor *
nautilus_monitor_file (const char *uri)
{