summaryrefslogtreecommitdiff
path: root/libnautilus-private/nautilus-monitor.c
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2008-01-07 15:31:41 +0000
committerAlexander Larsson <alexl@src.gnome.org>2008-01-07 15:31:41 +0000
commit50a2c42634abfeb454aebe6e803ce5b02d1351cf (patch)
tree6c20eb260a6da0db640d62b6fa7e438ddb55529d /libnautilus-private/nautilus-monitor.c
parent874865522ad4b44d82bb4b1650986b37c807d0c5 (diff)
downloadnautilus-50a2c42634abfeb454aebe6e803ce5b02d1351cf.tar.gz
Update to new gio API
2008-01-07 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-monitor.c: * libnautilus-private/nautilus-trash-monitor.c: Update to new gio API svn path=/trunk/; revision=13567
Diffstat (limited to 'libnautilus-private/nautilus-monitor.c')
-rw-r--r--libnautilus-private/nautilus-monitor.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libnautilus-private/nautilus-monitor.c b/libnautilus-private/nautilus-monitor.c
index 6d35b27ca..c5c2095a5 100644
--- a/libnautilus-private/nautilus-monitor.c
+++ b/libnautilus-private/nautilus-monitor.c
@@ -33,7 +33,7 @@
#include <libgnome/gnome-util.h>
struct NautilusMonitor {
- GDirectoryMonitor *monitor;
+ GFileMonitor *monitor;
};
gboolean
@@ -41,7 +41,7 @@ nautilus_monitor_active (void)
{
static gboolean tried_monitor = FALSE;
static gboolean monitor_success;
- GDirectoryMonitor *dir_monitor;
+ GFileMonitor *dir_monitor;
GFile *file;
if (tried_monitor == FALSE) {
@@ -71,7 +71,7 @@ call_consume_changes_idle_cb (gpointer not_used)
}
static void
-dir_changed (GDirectoryMonitor* monitor,
+dir_changed (GFileMonitor* monitor,
GFile *child,
GFile *other_file,
GFileMonitorEvent event_type,
@@ -121,7 +121,7 @@ dir_changed (GDirectoryMonitor* monitor,
NautilusMonitor *
nautilus_monitor_directory (GFile *location)
{
- GDirectoryMonitor *dir_monitor;
+ GFileMonitor *dir_monitor;
NautilusMonitor *ret;
dir_monitor = g_file_monitor_directory (location, G_FILE_MONITOR_WATCH_MOUNTS, NULL);
@@ -143,7 +143,7 @@ nautilus_monitor_cancel (NautilusMonitor *monitor)
{
if (monitor->monitor != NULL) {
g_signal_handlers_disconnect_by_func (monitor->monitor, dir_changed, monitor);
- g_directory_monitor_cancel (monitor->monitor);
+ g_file_monitor_cancel (monitor->monitor);
g_object_unref (monitor->monitor);
}