gvfs r1253 - in trunk: . client daemon hal programs

[alexl svn gnome org]

Author: alexl
Date: Mon Feb 11 11:14:35 2008
New Revision: 1253
URL: http://svn.gnome.org/viewvc/gvfs?rev=1253&view=rev

Log:
2008-02-11  Alexander Larsson  <alexl redhat com>

        * client/gdaemonfile.c:
        * daemon/gvfsbackendcomputer.c:
        * hal/ghalvolume.c:
        * programs/gvfs-mount.c:
	Update for the new mount flag argument.
	
        * hal/ghaldrive.c:
        * programs/gvfs-open.c:
	Fix warnings



Modified:
   trunk/ChangeLog
   trunk/client/gdaemonfile.c
   trunk/daemon/gvfsbackendcomputer.c
   trunk/hal/ghaldrive.c
   trunk/hal/ghalvolume.c
   trunk/programs/gvfs-mount.c
   trunk/programs/gvfs-open.c

Modified: trunk/client/gdaemonfile.c
==============================================================================
--- trunk/client/gdaemonfile.c	(original)
+++ trunk/client/gdaemonfile.c	Mon Feb 11 11:14:35 2008
@@ -1223,6 +1223,7 @@
   if (must_mount_location)
     {
       g_file_mount_enclosing_volume (file,
+				     0,
 				     mount_operation,
 				     cancellable,
 				     mount_mountable_location_mounted_cb,
@@ -1235,6 +1236,7 @@
 
 static void
 g_daemon_file_mount_mountable (GFile               *file,
+			       GMountMountFlags     flags,
 			       GMountOperation     *mount_operation,
 			       GCancellable        *cancellable,
 			       GAsyncReadyCallback  callback,
@@ -1364,6 +1366,7 @@
 } MountData;
 
 static void g_daemon_file_mount_enclosing_volume (GFile *location,
+						  GMountMountFlags flags,
 						  GMountOperation *mount_operation,
 						  GCancellable *cancellable,
 						  GAsyncReadyCallback callback,
@@ -1402,6 +1405,7 @@
 
 static void
 g_daemon_file_mount_enclosing_volume (GFile *location,
+				      GMountMountFlags  flags,
 				      GMountOperation *mount_operation,
 				      GCancellable *cancellable,
 				      GAsyncReadyCallback callback,

Modified: trunk/daemon/gvfsbackendcomputer.c
==============================================================================
--- trunk/daemon/gvfsbackendcomputer.c	(original)
+++ trunk/daemon/gvfsbackendcomputer.c	Mon Feb 11 11:14:35 2008
@@ -802,6 +802,7 @@
         {
           mount_op = g_mount_source_get_operation (mount_source);
           g_volume_mount (file->volume,
+                          0,
                           mount_op,
                           G_VFS_JOB (job)->cancellable,
                           mount_volume_cb,

Modified: trunk/hal/ghaldrive.c
==============================================================================
--- trunk/hal/ghaldrive.c	(original)
+++ trunk/hal/ghaldrive.c	Mon Feb 11 11:14:35 2008
@@ -877,7 +877,7 @@
   /* Null-terminate */
   g_ptr_array_add (res, NULL);
   
-  return g_ptr_array_free (res, FALSE);
+  return (char **)g_ptr_array_free (res, FALSE);
 }
 
 static void

Modified: trunk/hal/ghalvolume.c
==============================================================================
--- trunk/hal/ghalvolume.c	(original)
+++ trunk/hal/ghalvolume.c	Mon Feb 11 11:14:35 2008
@@ -818,6 +818,7 @@
 
 static void
 g_hal_volume_mount (GVolume             *volume,
+                    GMountMountFlags     flags,
                     GMountOperation     *mount_operation,
                     GCancellable        *cancellable,
                     GAsyncReadyCallback  callback,
@@ -839,7 +840,8 @@
       data->callback = callback;
       data->user_data = user_data;
 
-      g_file_mount_enclosing_volume (hal_volume->foreign_mount_root, 
+      g_file_mount_enclosing_volume (hal_volume->foreign_mount_root,
+                                     0,
                                      mount_operation, 
                                      cancellable, 
                                      mount_foreign_callback, 
@@ -970,7 +972,7 @@
   /* Null-terminate */
   g_ptr_array_add (res, NULL);
   
-  return g_ptr_array_free (res, FALSE);
+  return (char **)g_ptr_array_free (res, FALSE);
 }
 
 static void

Modified: trunk/programs/gvfs-mount.c
==============================================================================
--- trunk/programs/gvfs-mount.c	(original)
+++ trunk/programs/gvfs-mount.c	Mon Feb 11 11:14:35 2008
@@ -203,9 +203,9 @@
   op = new_mount_op ();
 
   if (mount_mountable)
-    g_file_mount_mountable (file, op, NULL, mount_mountable_done_cb, op);
+    g_file_mount_mountable (file, 0, op, NULL, mount_mountable_done_cb, op);
   else
-    g_file_mount_enclosing_volume (file, op, NULL, mount_done_cb, op);
+    g_file_mount_enclosing_volume (file, 0, op, NULL, mount_done_cb, op);
     
   outstanding_mounts++;
 }

Modified: trunk/programs/gvfs-open.c
==============================================================================
--- trunk/programs/gvfs-open.c	(original)
+++ trunk/programs/gvfs-open.c	Mon Feb 11 11:14:35 2008
@@ -40,13 +40,6 @@
   {NULL}
 };
 
-static GAppInfo *
-get_default_appinfo_for_file (GFile *file,
-			      GCancellable *cancellable,
-			      GError **error)
-{
-}
-
 static void
 open (GFile *file, char *arg_string)
 {