r21857 - in /desktop/unstable/glib2.0/debian: changelog patches/90_mimetype-sorting.patch patches/series

[slomo at users.alioth.debian.org]

Author: slomo
Date: Thu Oct  8 16:35:38 2009
New Revision: 21857

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21857
Log:
* debian/patches/90_mimetype-sorting.patch:
  + Fix sorting of mimetypes by weight. Highest weight means most
    important, not the other way around. Patch from upstream GIT.

Added:
    desktop/unstable/glib2.0/debian/patches/90_mimetype-sorting.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/series

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=21857&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Thu Oct  8 16:35:38 2009
@@ -1,3 +1,11 @@
+glib2.0 (2.22.2-2) unstable; urgency=low
+
+  * debian/patches/90_mimetype-sorting.patch:
+    + Fix sorting of mimetypes by weight. Highest weight means most
+      important, not the other way around. Patch from upstream GIT.
+
+ -- Sebastian Dröge <slomo at debian.org>  Thu, 08 Oct 2009 18:34:23 +0200
+
 glib2.0 (2.22.2-1) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]

Added: desktop/unstable/glib2.0/debian/patches/90_mimetype-sorting.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/90_mimetype-sorting.patch?rev=21857&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/90_mimetype-sorting.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/90_mimetype-sorting.patch [utf-8] Thu Oct  8 16:35:38 2009
@@ -1,0 +1,36 @@
+From 2a3710872f8bfc1c95dc8044c92c9ce020adad40 Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl at redhat.com>
+Date: Thu, 08 Oct 2009 09:59:23 +0000
+Subject: xdgmime: sort glob hits with larger weight first
+
+Higher weight is more important, so return these first meaning
+they will be used as the default.
+---
+diff --git a/gio/xdgmime/xdgmimecache.c b/gio/xdgmime/xdgmimecache.c
+index 6765787..97fe975 100644
+--- a/gio/xdgmime/xdgmimecache.c
++++ b/gio/xdgmime/xdgmimecache.c
+@@ -565,7 +565,7 @@ static int compare_mime_weight (const void *a, const void *b)
+   const MimeWeight *aa = (const MimeWeight *)a;
+   const MimeWeight *bb = (const MimeWeight *)b;
+ 
+-  return aa->weight - bb->weight;
++  return bb->weight - aa->weight;
+ }
+ 
+ #define ISUPPER(c)		((c) >= 'A' && (c) <= 'Z')
+diff --git a/gio/xdgmime/xdgmimeglob.c b/gio/xdgmime/xdgmimeglob.c
+index 2a0c777..c82bf22 100644
+--- a/gio/xdgmime/xdgmimeglob.c
++++ b/gio/xdgmime/xdgmimeglob.c
+@@ -381,7 +381,7 @@ static int compare_mime_weight (const void *a, const void *b)
+   const MimeWeight *aa = (const MimeWeight *)a;
+   const MimeWeight *bb = (const MimeWeight *)b;
+ 
+-  return aa->weight - bb->weight;
++  return bb->weight - aa->weight;
+ }
+ 
+ #define ISUPPER(c)		((c) >= 'A' && (c) <= 'Z')
+--
+cgit v0.8.2

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=21857&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Thu Oct  8 16:35:38 2009
@@ -3,3 +3,4 @@
 03_blacklist-directories.patch
 04_homedir_env.patch
 60_wait-longer-for-threads-to-die.patch
+90_mimetype-sorting.patch