summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2008-01-04 10:19:02 +0000
committerAlexander Larsson <alexl@src.gnome.org>2008-01-04 10:19:02 +0000
commitcdaf3ee13a18456a0cfbc35698b7dae726edde7d (patch)
tree6497d2e6afd37c74f086484986d1cf806f639d40
parent00ab20d791d035f632ca455b836d5baa2e333332 (diff)
downloadgvfs-cdaf3ee13a18456a0cfbc35698b7dae726edde7d.tar.gz
Update to new gio API
2008-01-04 Alexander Larsson <alexl@redhat.com> * daemon/gvfsbackendsftp.c: (make_reply_stream): Update to new gio API svn path=/trunk/; revision=1074
-rw-r--r--ChangeLog6
-rw-r--r--daemon/gvfsbackendsftp.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 84e6d07d..62566c3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-04 Alexander Larsson <alexl@redhat.com>
+
+ * daemon/gvfsbackendsftp.c:
+ (make_reply_stream):
+ Update to new gio API
+
2008-01-03 Matthias Clasen <mclasen@redhat.com>
* daemon/Makefile.am: Install the .mount files
diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
index 92536505..64f2c9cb 100644
--- a/daemon/gvfsbackendsftp.c
+++ b/daemon/gvfsbackendsftp.c
@@ -493,9 +493,7 @@ make_reply_stream (guint8 *data, gsize len)
GInputStream *mem_stream;
GDataInputStream *data_stream;
- mem_stream = g_memory_input_stream_from_data (data, len);
- g_memory_input_stream_set_free_data (G_MEMORY_INPUT_STREAM (mem_stream), TRUE);
-
+ mem_stream = g_memory_input_stream_new_from_data (data, len, g_free);
data_stream = g_data_input_stream_new (mem_stream);
g_object_unref (mem_stream);