gvfs r1161 - in trunk: . client common daemon

[alexl svn gnome org]

Author: alexl
Date: Mon Jan 21 15:33:29 2008
New Revision: 1161
URL: http://svn.gnome.org/viewvc/gvfs?rev=1161&view=rev

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

        * client/gdaemonfile.c:
        * client/sftpuri.c:
        * common/gmounttracker.c:
        * daemon/gvfsmonitor.c:
        * daemon/gvfsbackend.c:
	Fix warnings
	
        * daemon/gvfsbackendburn.c:
        * daemon/gvfsbackendlocaltest.c:
        * daemon/gvfsbackendtrash.c:
	Update to latest gio API (removal of
	duplicate GSeekable calls).
	
2008-01-21  Alexander Larsson  <alexl redhat com>

	* configure.ac:
	Post release version bump



Modified:
   trunk/ChangeLog
   trunk/client/gdaemonfile.c
   trunk/client/sftpuri.c
   trunk/common/gmounttracker.c
   trunk/configure.ac
   trunk/daemon/gvfsbackend.c
   trunk/daemon/gvfsbackendburn.c
   trunk/daemon/gvfsbackendlocaltest.c
   trunk/daemon/gvfsbackendtrash.c
   trunk/daemon/gvfsmonitor.c

Modified: trunk/client/gdaemonfile.c
==============================================================================
--- trunk/client/gdaemonfile.c	(original)
+++ trunk/client/gdaemonfile.c	Mon Jan 21 15:33:29 2008
@@ -1385,7 +1385,7 @@
 		      G_VFS_DBUS_MOUNT_OP_UNMOUNT_MOUNTABLE,
 		      cancellable,
 		      callback, user_data,
-		      eject_mountable_async_cb,
+		      unmount_mountable_async_cb,
 		      NULL, NULL,
 		      DBUS_TYPE_UINT32, &dbus_flags,
 		      0);

Modified: trunk/client/sftpuri.c
==============================================================================
--- trunk/client/sftpuri.c	(original)
+++ trunk/client/sftpuri.c	Mon Jan 21 15:33:29 2008
@@ -110,7 +110,6 @@
 	     GVfsUriMountInfo *info,
 	     gboolean allow_utf8)
 {
-  char *s;
   GDecodedUri uri;
   const char *port;
 

Modified: trunk/common/gmounttracker.c
==============================================================================
--- trunk/common/gmounttracker.c	(original)
+++ trunk/common/gmounttracker.c	Mon Jan 21 15:33:29 2008
@@ -446,7 +446,6 @@
 init_connection (GMountTracker *tracker)
 {
   DBusMessage *message, *reply;
-  DBusPendingCall *pending;
 
   if (tracker->connection == NULL)
     tracker->connection = dbus_bus_get (DBUS_BUS_SESSION, NULL);

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Jan 21 15:33:29 2008
@@ -1,6 +1,6 @@
 AC_INIT(client/gdaemonvfs.h)
 
-AM_INIT_AUTOMAKE(gvfs, 0.1.3)
+AM_INIT_AUTOMAKE(gvfs, 0.1.4)
 AM_CONFIG_HEADER(config.h)
 	
 AM_SANITY_CHECK

Modified: trunk/daemon/gvfsbackend.c
==============================================================================
--- trunk/daemon/gvfsbackend.c	(original)
+++ trunk/daemon/gvfsbackend.c	Mon Jan 21 15:33:29 2008
@@ -48,6 +48,7 @@
 #include <gvfsjobmakedirectory.h>
 #include <gvfsjobmakesymlink.h>
 #include <gvfsjobcreatemonitor.h>
+#include <gvfsjobupload.h>
 #include <gvfsjobcopy.h>
 #include <gvfsjobmove.h>
 #include <gvfsjobsetattribute.h>

Modified: trunk/daemon/gvfsbackendburn.c
==============================================================================
--- trunk/daemon/gvfsbackendburn.c	(original)
+++ trunk/daemon/gvfsbackendburn.c	Mon Jan 21 15:33:29 2008
@@ -468,7 +468,7 @@
   
   if (stream)
     {
-      g_vfs_job_open_for_read_set_can_seek (job, g_file_input_stream_can_seek (stream));
+      g_vfs_job_open_for_read_set_can_seek (job, g_seekable_can_seek (G_SEEKABLE (stream)));
       g_vfs_job_open_for_read_set_handle (job, stream);
       g_vfs_job_succeeded (G_VFS_JOB (job));
     }
@@ -520,10 +520,10 @@
   GFileInputStream *stream = _handle;
   
   error = NULL;
-  if (g_file_input_stream_seek (stream, offset, type,
-                                G_VFS_JOB (job)->cancellable, &error))
+  if (g_seekable_seek (G_SEEKABLE (stream), offset, type,
+                       G_VFS_JOB (job)->cancellable, &error))
     {
-      g_vfs_job_seek_read_set_offset (job, g_file_input_stream_tell(stream));
+      g_vfs_job_seek_read_set_offset (job, g_seekable_tell (G_SEEKABLE (stream)));
       g_vfs_job_succeeded (G_VFS_JOB (job));
     }
   else

Modified: trunk/daemon/gvfsbackendlocaltest.c
==============================================================================
--- trunk/daemon/gvfsbackendlocaltest.c	(original)
+++ trunk/daemon/gvfsbackendlocaltest.c	Mon Jan 21 15:33:29 2008
@@ -755,8 +755,6 @@
 				      GFileMonitorFlags flags,
 				      const gboolean is_dir_monitor)
 {
-  GVfsBackendLocalTest *op_backend = G_VFS_BACKEND_LOCALTEST (backend);
-
   GObject *monitor;
   MonitorProxy *proxy;
   GFile *file = get_g_file_from_local (filename, G_VFS_JOB (job));
@@ -840,7 +838,7 @@
 	  error = NULL;
 	  stream = g_file_read (file, G_VFS_JOB (job)->cancellable, &error);
 	  if (stream) {
-	      g_vfs_job_open_for_read_set_can_seek (job, g_file_input_stream_can_seek(stream));
+	    g_vfs_job_open_for_read_set_can_seek (job, g_seekable_can_seek (G_SEEKABLE (stream)));
 	      g_vfs_job_open_for_read_set_handle (job, stream);
 		  inject_error (backend, G_VFS_JOB (job), GVFS_JOB_OPEN_FOR_READ);
 		  g_print ("(II) try_open_for_read success. \n");
@@ -895,8 +893,8 @@
   g_assert(stream != NULL);
   
   error = NULL;
-  if (g_file_input_stream_seek (stream, offset, type, G_VFS_JOB (job)->cancellable, &error)) {
-      g_vfs_job_seek_read_set_offset (job, g_file_input_stream_tell(stream));
+  if (g_seekable_seek (G_SEEKABLE (stream), offset, type, G_VFS_JOB (job)->cancellable, &error)) {
+    g_vfs_job_seek_read_set_offset (job, g_seekable_tell (G_SEEKABLE (stream)));
 	  inject_error (backend, G_VFS_JOB (job), GVFS_JOB_SEEK_ON_READ);
 	  g_print ("(II) try_seek_on_read success. \n");
   } else  {
@@ -947,12 +945,12 @@
 	  stream = g_file_append_to (file, flags, G_VFS_JOB (job)->cancellable, &error);
 	  if (stream) {
 		  //  Should seek at the end of the file here
-		  if ((g_file_output_stream_seek (stream, 0, G_SEEK_END, G_VFS_JOB (job)->cancellable, &error)) && (! error))
-			  g_vfs_job_open_for_write_set_initial_offset (job, g_file_output_stream_tell(stream));
+	    if ((g_seekable_seek (G_SEEKABLE (stream), 0, G_SEEK_END, G_VFS_JOB (job)->cancellable, &error)) && (! error))
+	      g_vfs_job_open_for_write_set_initial_offset (job, g_seekable_tell (G_SEEKABLE (stream)));
 		  else
 			  g_print ("  (EE) try_append_to: error during g_file_output_stream_seek(), error: %s \n", error->message);
 
-	      g_vfs_job_open_for_write_set_can_seek (job, g_file_output_stream_can_seek(stream));
+	    g_vfs_job_open_for_write_set_can_seek (job, g_seekable_can_seek (G_SEEKABLE (stream)));
 	      g_vfs_job_open_for_write_set_handle (job, stream);
 		  inject_error (backend, G_VFS_JOB (job), GVFS_JOB_APPEND_TO);
 
@@ -984,7 +982,7 @@
 	  error = NULL;
 	  stream = g_file_create (file, flags, G_VFS_JOB (job)->cancellable, &error);
 	  if (stream) {
-	      g_vfs_job_open_for_write_set_can_seek (job, g_file_output_stream_can_seek(stream));
+	    g_vfs_job_open_for_write_set_can_seek (job, g_seekable_can_seek (G_SEEKABLE (stream)));
 	      g_vfs_job_open_for_write_set_handle (job, stream);
 		  inject_error (backend, G_VFS_JOB (job), GVFS_JOB_CREATE);
 		  g_print ("(II) try_create success. \n");
@@ -1017,7 +1015,7 @@
 	  error = NULL;
 	  stream = g_file_replace (file, etag, make_backup, flags, G_VFS_JOB (job)->cancellable, &error);
 	  if (stream) {
-	      g_vfs_job_open_for_write_set_can_seek (job, g_file_output_stream_can_seek(stream));
+	    g_vfs_job_open_for_write_set_can_seek (job, g_seekable_can_seek (G_SEEKABLE (stream)));
 	      g_vfs_job_open_for_write_set_handle (job, stream);
 		  inject_error (backend, G_VFS_JOB (job), GVFS_JOB_REPLACE);
 		  g_print ("(II) try_replace success. \n");
@@ -1072,8 +1070,8 @@
   g_assert(stream != NULL);
   
   error = NULL;
-  if (g_file_output_stream_seek (stream, offset, type, G_VFS_JOB (job)->cancellable, &error)) {
-	  g_vfs_job_seek_write_set_offset (job, g_file_output_stream_tell(stream));
+  if (g_seekable_seek (G_SEEKABLE (stream), offset, type, G_VFS_JOB (job)->cancellable, &error)) {
+    g_vfs_job_seek_write_set_offset (job, g_seekable_tell(G_SEEKABLE(stream)));
 	  inject_error (backend, G_VFS_JOB (job), GVFS_JOB_SEEK_ON_WRITE);
 	  g_print ("(II) try_seek_on_write success. \n");
   } else  {

Modified: trunk/daemon/gvfsbackendtrash.c
==============================================================================
--- trunk/daemon/gvfsbackendtrash.c	(original)
+++ trunk/daemon/gvfsbackendtrash.c	Mon Jan 21 15:33:29 2008
@@ -650,7 +650,7 @@
         {
           g_vfs_job_open_for_read_set_handle (job, stream);
           g_vfs_job_open_for_read_set_can_seek  (job,
-                                                 g_file_input_stream_can_seek (G_FILE_INPUT_STREAM (stream)));
+                                                 g_seekable_can_seek (G_SEEKABLE (stream)));
           g_vfs_job_succeeded (G_VFS_JOB (job));
         }
       else
@@ -711,13 +711,13 @@
   stream = G_FILE_INPUT_STREAM (_handle);
 
   error = NULL;
-  if (g_file_input_stream_seek (stream,
-                                offset, type,
-                                G_VFS_JOB (job)->cancellable,
-                                &error))
+  if (g_seekable_seek (G_SEEKABLE (stream),
+                       offset, type,
+                       G_VFS_JOB (job)->cancellable,
+                       &error))
     {
       g_vfs_job_seek_read_set_offset (job,
-                                      g_file_input_stream_tell (stream));
+                                      g_seekable_tell (G_SEEKABLE (stream)));
       g_vfs_job_succeeded (G_VFS_JOB (job));
     }
   else

Modified: trunk/daemon/gvfsmonitor.c
==============================================================================
--- trunk/daemon/gvfsmonitor.c	(original)
+++ trunk/daemon/gvfsmonitor.c	Mon Jan 21 15:33:29 2008
@@ -78,13 +78,12 @@
 	      GObject     *old_backend)
 {
   Subscriber *subscriber;
-  GList *l;
   
   monitor->priv->backend = NULL;
 
   while (monitor->priv->subscribers != NULL)
     {
-      subscriber = l->data;
+      subscriber = monitor->priv->subscribers->data;
       unsubscribe (monitor, subscriber);
     }
 }
@@ -247,7 +246,6 @@
 g_vfs_monitor_new (GVfsBackend *backend)
 {
   GVfsMonitor *monitor;
-  GVfsDaemon *daemon;
   
   monitor = g_object_new (G_TYPE_VFS_MONITOR, NULL);