- Update to 1.1.7

This commit is contained in:
Tomas Bzatek 2009-03-02 16:34:21 +00:00
parent 9a3599194b
commit 6372ee587e
4 changed files with 7 additions and 70 deletions

View File

@ -1 +1 @@
gvfs-1.1.6.tar.bz2 gvfs-1.1.7.tar.bz2

View File

@ -1,62 +0,0 @@
Index: daemon/gvfsbackendburn.c
===================================================================
--- daemon/gvfsbackendburn.c (revisione 2144)
+++ daemon/gvfsbackendburn.c (copia locale)
@@ -953,6 +953,49 @@
return TRUE;
}
+static gboolean
+try_move (GVfsBackend *backend,
+ GVfsJobMove *job,
+ const char *source,
+ const char *destination,
+ GFileCopyFlags flags,
+ GFileProgressCallback progress_callback,
+ gpointer progress_callback_data)
+{
+ VirtualNode *source_node, *root_node, *source_dir, *dest_dir;
+
+ root_node = G_VFS_BACKEND_BURN (backend)->root_node;
+
+ source_node = virtual_node_lookup (root_node, source, &source_dir);
+ if (source_node == NULL)
+ {
+ g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+ G_IO_ERROR_NOT_FOUND,
+ _("No such file or directory"));
+ return TRUE;
+ }
+
+ if (virtual_node_lookup (root_node, destination, &dest_dir) != NULL)
+ {
+ g_vfs_job_failed (G_VFS_JOB (job), G_IO_ERROR,
+ G_IO_ERROR_EXISTS,
+ _("File exists"));
+ return TRUE;
+ }
+
+ g_free (source_node->filename);
+ source_node->filename = g_path_get_basename (destination);
+
+ if (source_dir != dest_dir) {
+ source_dir->children = g_list_remove (source_dir->children, source_node);
+ dest_dir->children = g_list_append (dest_dir->children, source_node);
+ }
+
+ g_vfs_job_succeeded (G_VFS_JOB (job));
+
+ return TRUE;
+}
+
static void
g_vfs_backend_burn_class_init (GVfsBackendBurnClass *klass)
{
@@ -970,6 +1013,7 @@
backend_class->try_set_display_name = try_set_display_name;
backend_class->try_push = try_push;
backend_class->try_delete = try_delete;
+ backend_class->try_move = try_move;
backend_class->read = do_read;
backend_class->seek_on_read = do_seek_on_read;
backend_class->close_read = do_close_read;

View File

@ -1,7 +1,7 @@
Summary: Backends for the gio framework in GLib Summary: Backends for the gio framework in GLib
Name: gvfs Name: gvfs
Version: 1.1.6 Version: 1.1.7
Release: 2%{?dist} Release: 1%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.gtk.org URL: http://www.gtk.org
@ -31,9 +31,6 @@ BuildRequires: libtool
# http://bugzilla.gnome.org/show_bug.cgi?id=567235 # http://bugzilla.gnome.org/show_bug.cgi?id=567235
Patch1: gvfs-0.99.2-archive-integration.patch Patch1: gvfs-0.99.2-archive-integration.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=565041
Patch2: gvfs-burn-move.patch
%description %description
The gvfs package provides backend implementations for the gio The gvfs package provides backend implementations for the gio
@ -116,7 +113,6 @@ media players (Media Transfer Protocol) to applications using gvfs.
%prep %prep
%setup -q %setup -q
%patch1 -p0 -b .archive-integration %patch1 -p0 -b .archive-integration
%patch2 -p0 -b .burn-move
%build %build
@ -257,6 +253,9 @@ update-desktop-database &> /dev/null ||:
%changelog %changelog
* Mon Mar 2 2009 Tomas Bzatek <tbzatek@redhat.com> - 1.1.7-1
- Update to 1.1.7
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.6-2 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

View File

@ -1 +1 @@
66c69088f63991a965e242e4a516bc2c gvfs-1.1.6.tar.bz2 c5528812561936fd9501a62382d24585 gvfs-1.1.7.tar.bz2