Update to new gio API

2008-01-14  Alexander Larsson  <alexl@redhat.com>

        * client/gdaemonfile.c:
        * daemon/gvfsbackendlocaltest.c:
        * daemon/gvfsbackendtrash.c:
        * programs/gvfs-monitor-dir.c:
        * programs/gvfs-monitor-file.c:
	Update to new gio API


svn path=/trunk/; revision=1125

6 files changed, 28 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index c2b04440..a64ed293 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
 2008-01-14  Alexander Larsson  <alexl@redhat.com>
 
         * client/gdaemonfile.c:
+        * daemon/gvfsbackendlocaltest.c:
+        * daemon/gvfsbackendtrash.c:
+        * programs/gvfs-monitor-dir.c:
+        * programs/gvfs-monitor-file.c:
+	Update to new gio API
+
+2008-01-14  Alexander Larsson  <alexl@redhat.com>
+
+        * client/gdaemonfile.c:
         (match_prefix):
 	Handle root correctly in g_file_get_relative_path (#508719)
 
diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c
index 88e81ec2..10457cdd 100644
--- a/client/gdaemonfile.c
+++ b/client/gdaemonfile.c
@@ -1950,7 +1950,8 @@ g_daemon_file_move (GFile                  *source,
 static GFileMonitor*
 g_daemon_file_monitor_dir (GFile* file,
 			   GFileMonitorFlags flags,
-			   GCancellable *cancellable)
+			   GCancellable *cancellable,
+			   GError **error)
 {
   GFileMonitor *monitor;
   char *obj_path;
@@ -1964,7 +1965,7 @@ g_daemon_file_monitor_dir (GFile* file,
   reply = do_sync_path_call (file, 
 			     G_VFS_DBUS_MOUNT_OP_CREATE_DIR_MONITOR,
 			     &mount_info, NULL,
-			     cancellable, NULL,
+			     cancellable, error,
 			     DBUS_TYPE_UINT32, &flags_dbus,
 			     0);
   
@@ -1981,7 +1982,8 @@ g_daemon_file_monitor_dir (GFile* file,
     {
       g_mount_info_unref (mount_info);
       dbus_message_unref (reply);
-      g_warning ("Invalid return value from monitor_dir");
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+		   _("Invalid return value from monitor_dir"));
       return NULL;
     }
   
@@ -1997,7 +1999,8 @@ g_daemon_file_monitor_dir (GFile* file,
 static GFileMonitor*
 g_daemon_file_monitor_file (GFile* file,
 			    GFileMonitorFlags flags,
-			    GCancellable *cancellable)
+			    GCancellable *cancellable,
+			    GError **error)
 {
   GFileMonitor *monitor;
   char *obj_path;
@@ -2011,7 +2014,7 @@ g_daemon_file_monitor_file (GFile* file,
   reply = do_sync_path_call (file, 
 			     G_VFS_DBUS_MOUNT_OP_CREATE_FILE_MONITOR,
 			     &mount_info, NULL,
-			     cancellable, NULL,
+			     cancellable, error,
 			     DBUS_TYPE_UINT32, &flags_dbus,
 			     0);
   
@@ -2028,7 +2031,8 @@ g_daemon_file_monitor_file (GFile* file,
     {
       g_mount_info_unref (mount_info);
       dbus_message_unref (reply);
-      g_warning ("Invalid return value from monitor_dir");
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+		   _("Invalid return value from monitor_file"));
       return NULL;
     }
   
diff --git a/daemon/gvfsbackendlocaltest.c b/daemon/gvfsbackendlocaltest.c
index 5e6129f6..04c20260 100644
--- a/daemon/gvfsbackendlocaltest.c
+++ b/daemon/gvfsbackendlocaltest.c
@@ -762,8 +762,8 @@ create_dir_file_monitor (GVfsBackend *backend,
   GFile *file = get_g_file_from_local (filename, G_VFS_JOB (job));
   g_assert(file != NULL);
   
-  if (is_dir_monitor) monitor = G_OBJECT(g_file_monitor_directory (file, flags, G_VFS_JOB (job)->cancellable));
-  else monitor = G_OBJECT(g_file_monitor_file (file, flags, G_VFS_JOB (job)->cancellable));
+  if (is_dir_monitor) monitor = G_OBJECT(g_file_monitor_directory (file, flags, G_VFS_JOB (job)->cancellable, NULL));
+  else monitor = G_OBJECT(g_file_monitor_file (file, flags, G_VFS_JOB (job)->cancellable, NULL));
 	  
   if (monitor)
     {
diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c
index 999eaec0..6e198480 100644
--- a/daemon/gvfsbackendtrash.c
+++ b/daemon/gvfsbackendtrash.c
@@ -1402,7 +1402,7 @@ update_trash_dir_monitors (GVfsBackendTrash *backend)
       filesdir = g_build_filename (trashdir, "files", NULL);
       file = g_file_new_for_path (filesdir);
       g_free (filesdir);
-      monitor = g_file_monitor_directory (file, 0, NULL);
+      monitor = g_file_monitor_directory (file, 0, NULL, NULL);
       g_object_unref (file);
       
       if (monitor)
@@ -1573,7 +1573,8 @@ do_create_dir_monitor (GVfsBackend *backend,
 
       monitor = g_file_monitor_directory (file,
                                           flags,
-                                          G_VFS_JOB (job)->cancellable);
+                                          G_VFS_JOB (job)->cancellable,
+					  NULL);
       
       if (monitor)
         {
@@ -1648,7 +1649,8 @@ do_create_file_monitor (GVfsBackend *backend,
 
       monitor = g_file_monitor_file (file,
                                      flags,
-                                     G_VFS_JOB (job)->cancellable);
+                                     G_VFS_JOB (job)->cancellable,
+				     NULL);
       
       if (monitor)
         {
diff --git a/programs/gvfs-monitor-dir.c b/programs/gvfs-monitor-dir.c
index dbc2e166..bf2f6288 100644
--- a/programs/gvfs-monitor-dir.c
+++ b/programs/gvfs-monitor-dir.c
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
   if (argc > 1)
     {
       file = g_file_new_for_commandline_arg (argv[1]);
-      dmonitor = g_file_monitor_directory (file, G_FILE_MONITOR_WATCH_MOUNTS, NULL);
+      dmonitor = g_file_monitor_directory (file, G_FILE_MONITOR_WATCH_MOUNTS, NULL, NULL);
       if (dmonitor != NULL)
 	g_signal_connect (dmonitor, "changed", (GCallback)dir_monitor_callback, NULL);
       else
diff --git a/programs/gvfs-monitor-file.c b/programs/gvfs-monitor-file.c
index 302b17f4..842ed938 100644
--- a/programs/gvfs-monitor-file.c
+++ b/programs/gvfs-monitor-file.c
@@ -93,7 +93,7 @@ main (int argc, char *argv[])
   if (argc > 1)
     {
       file = g_file_new_for_commandline_arg (argv[1]);
-      fmonitor = g_file_monitor_file (file, G_FILE_MONITOR_WATCH_MOUNTS, NULL);
+      fmonitor = g_file_monitor_file (file, G_FILE_MONITOR_WATCH_MOUNTS, NULL, NULL);
       g_signal_connect (fmonitor, "changed", (GCallback)file_monitor_callback, NULL);
     }