r16250 - in /desktop/unstable/gnome-vfs/debian: changelog patches/11_mime_text_parent.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Jun 14 11:07:58 2008
New Revision: 16250

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16250
Log:
11_mime_text_parent.patch: new patch. Make all text/* mime types 
inherit from text/plain, as specified by the XDG documents.
Closes: #485660.

Added:
    desktop/unstable/gnome-vfs/debian/patches/11_mime_text_parent.patch
Modified:
    desktop/unstable/gnome-vfs/debian/changelog
    desktop/unstable/gnome-vfs/debian/patches/series

Modified: desktop/unstable/gnome-vfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/changelog?rev=16250&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/changelog (original)
+++ desktop/unstable/gnome-vfs/debian/changelog Sat Jun 14 11:07:58 2008
@@ -1,9 +1,12 @@
-gnome-vfs (1:2.22.0-4) UNRELEASED; urgency=low
+gnome-vfs (1:2.22.0-4) unstable; urgency=low
 
   * defaults.list: make OOo the default handler for MS Word files, since 
     Abiword is still not good enough at that.
-
- -- Josselin Mouette <joss at debian.org>  Tue, 03 Jun 2008 21:34:43 +0200
+  * 11_mime_text_parent.patch: new patch. Make all text/* mime types 
+    inherit from text/plain, as specified by the XDG documents.
+    Closes: #485660.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 14 Jun 2008 12:56:41 +0200
 
 gnome-vfs (1:2.22.0-3) unstable; urgency=low
 

Added: desktop/unstable/gnome-vfs/debian/patches/11_mime_text_parent.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/11_mime_text_parent.patch?rev=16250&op=file
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/11_mime_text_parent.patch (added)
+++ desktop/unstable/gnome-vfs/debian/patches/11_mime_text_parent.patch Sat Jun 14 11:07:58 2008
@@ -1,0 +1,19 @@
+Index: gnome-vfs-2.22.0/libgnomevfs/gnome-vfs-mime-info-cache.c
+===================================================================
+--- gnome-vfs-2.22.0.orig/libgnomevfs/gnome-vfs-mime-info-cache.c	2008-06-14 12:48:22.265972281 +0200
++++ gnome-vfs-2.22.0/libgnomevfs/gnome-vfs-mime-info-cache.c	2008-06-14 12:52:05.342678608 +0200
+@@ -703,7 +703,13 @@ get_all_parent_types (const char *mime_t
+ 	for (i = 0; parents && parents[i] != NULL; i++) {
+ 		l = g_list_prepend (l, g_strdup (parents[i]));
+ 	}
+-	
++
++	/* Special case for text/something */
++	if (g_str_has_prefix (mime_type, "text/") &&
++	    strcmp (mime_type, "text/plain")) {
++		l = g_list_prepend (l, g_strdup ("text/plain"));
++	}
++
+ 	G_UNLOCK (gnome_vfs_mime_mutex);
+ 
+ 	return g_list_reverse (l);

Modified: desktop/unstable/gnome-vfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/series?rev=16250&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/series (original)
+++ desktop/unstable/gnome-vfs/debian/patches/series Sat Jun 14 11:07:58 2008
@@ -8,6 +8,7 @@
 08_recursive_local_check.patch
 09_gnomevfs_mount_selection.patch
 10_configuration_loop.patch
+11_mime_text_parent.patch
 12_user_visible_drives.patch
 13_resolve_fstab_symlinks.patch
 14_app_cdda.patch