rpms/gvfs/devel gvfs-1.0.2-guess_content_type.patch, NONE, 1.1 gvfs.spec, 1.89, 1.90
Tomas Bzatek
tbzatek at fedoraproject.org
Tue Nov 4 14:17:31 UTC 2008
Author: tbzatek
Update of /cvs/extras/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17508
Modified Files:
gvfs.spec
Added Files:
gvfs-1.0.2-guess_content_type.patch
Log Message:
* Tue Nov 4 2008 Tomas Bzatek <tbzatek at redhat.com> - 1.0.2-3
- Return an empty array on success when no content type
matches (#468946)
gvfs-1.0.2-guess_content_type.patch:
--- NEW FILE gvfs-1.0.2-guess_content_type.patch ---
Index: client/gdaemonmount.c
===================================================================
--- client/gdaemonmount.c (revision 2080)
+++ client/gdaemonmount.c (working copy)
@@ -366,11 +366,12 @@
GDaemonMount *daemon_mount = G_DAEMON_MOUNT (mount);
char **result;
- result = NULL;
G_LOCK (daemon_mount);
if (daemon_mount->mount_info->x_content_types != NULL &&
strlen (daemon_mount->mount_info->x_content_types) > 0)
result = g_strsplit (daemon_mount->mount_info->x_content_types, " ", 0);
+ else
+ result = g_new0 (char *, 1);
G_UNLOCK (daemon_mount);
return result;
Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- gvfs.spec 24 Oct 2008 09:22:24 -0000 1.89
+++ gvfs.spec 4 Nov 2008 14:17:01 -0000 1.90
@@ -1,7 +1,7 @@
Summary: Backends for the gio framework in GLib
Name: gvfs
Version: 1.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.gtk.org
@@ -38,6 +38,8 @@
# http://bugzilla.gnome.org/show_bug.cgi?id=528320 (from svn)
Patch5: gvfs-1.0.2-no-generic-icons.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=468946
+Patch6: gvfs-1.0.2-guess_content_type.patch
%description
The gvfs package provides backend implementations for the gio
@@ -123,6 +125,7 @@
%patch2 -p0 -b .bluez-ods
%patch4 -p1 -b .reverse-map-fuse-paths.patch
%patch5 -p0 -b .no-generic-icons
+%patch6 -p0 -b .guess-content-type
%build
@@ -260,6 +263,10 @@
%changelog
+* Tue Nov 4 2008 Tomas Bzatek <tbzatek at redhat.com> - 1.0.2-3
+- Return an empty array on success when no content type
+ matches (#468946)
+
* Fri Oct 24 2008 Alexander Larsson <alexl at redhat.com> - 1.0.2-2
- Don't return generic fallback icons for files,
as this means custom mimetypes don't work (from svn)
More information about the fedora-extras-commits
mailing list