nautilus r13567 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Mon Jan  7 15:31:41 2008
New Revision: 13567
URL: http://svn.gnome.org/viewvc/nautilus?rev=13567&view=rev

Log:
2008-01-07  Alexander Larsson  <alexl redhat com>

        * libnautilus-private/nautilus-monitor.c:
        * libnautilus-private/nautilus-trash-monitor.c:
	Update to new gio API



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-monitor.c
   trunk/libnautilus-private/nautilus-trash-monitor.c

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Mon Jan  7 15:31:41 2008
@@ -1,3 +1,9 @@
+2008-01-07  Alexander Larsson  <alexl redhat com>
+
+        * libnautilus-private/nautilus-monitor.c:
+        * libnautilus-private/nautilus-trash-monitor.c:
+	Update to new gio API
+
 2008-01-04  Alexander Larsson  <alexl redhat com>
 
         * libnautilus-extension/libnautilus-extension.pc.in:

Modified: trunk/libnautilus-private/nautilus-monitor.c
==============================================================================
--- trunk/libnautilus-private/nautilus-monitor.c	(original)
+++ trunk/libnautilus-private/nautilus-monitor.c	Mon Jan  7 15:31:41 2008
@@ -33,7 +33,7 @@
 #include <libgnome/gnome-util.h>
 
 struct NautilusMonitor {
-	GDirectoryMonitor *monitor;
+	GFileMonitor *monitor;
 };
 
 gboolean
@@ -41,7 +41,7 @@
 {
 	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 @@
 }
 
 static void
-dir_changed (GDirectoryMonitor* monitor,
+dir_changed (GFileMonitor* monitor,
 	     GFile *child,
 	     GFile *other_file,
 	     GFileMonitorEvent event_type,
@@ -121,7 +121,7 @@
 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 @@
 {
 	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);
 	}
 

Modified: trunk/libnautilus-private/nautilus-trash-monitor.c
==============================================================================
--- trunk/libnautilus-private/nautilus-trash-monitor.c	(original)
+++ trunk/libnautilus-private/nautilus-trash-monitor.c	Mon Jan  7 15:31:41 2008
@@ -149,7 +149,7 @@
 }
 
 static void
-file_changed (GDirectoryMonitor* monitor,
+file_changed (GFileMonitor* monitor,
 	      GFile *child,
 	      GFile *other_file,
 	      GFileMonitorEvent event_type,