summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog20
-rw-r--r--client/gdaemonfile.c2
-rw-r--r--client/sftpuri.c1
-rw-r--r--common/gmounttracker.c1
-rw-r--r--configure.ac2
-rw-r--r--daemon/gvfsbackend.c1
-rw-r--r--daemon/gvfsbackendburn.c8
-rw-r--r--daemon/gvfsbackendlocaltest.c22
-rw-r--r--daemon/gvfsbackendtrash.c12
-rw-r--r--daemon/gvfsmonitor.c4
10 files changed, 44 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index 310cadaa..7644c873 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
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
+
+2008-01-21 Alexander Larsson <alexl@redhat.com>
+
* NEWS:
Update for release
diff --git a/client/gdaemonfile.c b/client/gdaemonfile.c
index 1434740e..e09493b2 100644
--- a/client/gdaemonfile.c
+++ b/client/gdaemonfile.c
@@ -1385,7 +1385,7 @@ g_daemon_file_unmount_mountable (GFile *file,
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);
diff --git a/client/sftpuri.c b/client/sftpuri.c
index 0193653d..65ed6cbd 100644
--- a/client/sftpuri.c
+++ b/client/sftpuri.c
@@ -110,7 +110,6 @@ sftp_to_uri (GVfsUriMapper *mapper,
GVfsUriMountInfo *info,
gboolean allow_utf8)
{
- char *s;
GDecodedUri uri;
const char *port;
diff --git a/common/gmounttracker.c b/common/gmounttracker.c
index 3bbc7e03..b84684ab 100644
--- a/common/gmounttracker.c
+++ b/common/gmounttracker.c
@@ -446,7 +446,6 @@ static void
init_connection (GMountTracker *tracker)
{
DBusMessage *message, *reply;
- DBusPendingCall *pending;
if (tracker->connection == NULL)
tracker->connection = dbus_bus_get (DBUS_BUS_SESSION, NULL);
diff --git a/configure.ac b/configure.ac
index 69f39a0f..1a4905e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/daemon/gvfsbackend.c b/daemon/gvfsbackend.c
index b3494bb8..9c766583 100644
--- a/daemon/gvfsbackend.c
+++ b/daemon/gvfsbackend.c
@@ -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>
diff --git a/daemon/gvfsbackendburn.c b/daemon/gvfsbackendburn.c
index c4417ea7..7f1a2a23 100644
--- a/daemon/gvfsbackendburn.c
+++ b/daemon/gvfsbackendburn.c
@@ -468,7 +468,7 @@ try_open_for_read (GVfsBackend *backend,
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 @@ do_seek_on_read (GVfsBackend *backend,
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
diff --git a/daemon/gvfsbackendlocaltest.c b/daemon/gvfsbackendlocaltest.c
index bac21347..23580606 100644
--- a/daemon/gvfsbackendlocaltest.c
+++ b/daemon/gvfsbackendlocaltest.c
@@ -755,8 +755,6 @@ create_dir_file_monitor (GVfsBackend *backend,
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 @@ do_open_for_read (GVfsBackend *backend,
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 @@ do_seek_on_read (GVfsBackend *backend,
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 @@ do_append_to (GVfsBackend *backend,
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 @@ do_create (GVfsBackend *backend,
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 @@ do_replace (GVfsBackend *backend,
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 @@ do_seek_on_write (GVfsBackend *backend,
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 {
diff --git a/daemon/gvfsbackendtrash.c b/daemon/gvfsbackendtrash.c
index 3d077efc..c8e78005 100644
--- a/daemon/gvfsbackendtrash.c
+++ b/daemon/gvfsbackendtrash.c
@@ -650,7 +650,7 @@ do_open_for_read (GVfsBackend *backend,
{
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 @@ do_seek_on_read (GVfsBackend *backend,
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
diff --git a/daemon/gvfsmonitor.c b/daemon/gvfsmonitor.c
index e3040bd8..0407cb29 100644
--- a/daemon/gvfsmonitor.c
+++ b/daemon/gvfsmonitor.c
@@ -78,13 +78,12 @@ backend_died (GVfsMonitor *monitor,
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 @@ GVfsMonitor *
g_vfs_monitor_new (GVfsBackend *backend)
{
GVfsMonitor *monitor;
- GVfsDaemon *daemon;
monitor = g_object_new (G_TYPE_VFS_MONITOR, NULL);